[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit c1b3827f417787b2a0b8fe85bb892821bcbbc444
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jul 28 16:55:54 2010 -0400

    Revert ".. and jinja2."
    
    This reverts commit 1940909417b7f626a0465390d0fedc0ea995ebac.
    
    Conflicts:
    
    	config/debian/control
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/config/debian/control b/config/debian/control
index fcd01e9..c1d4af5 100644
--- a/config/debian/control
+++ b/config/debian/control
@@ -5,7 +5,7 @@ Maintainer: debian-live <debian-live at lists.debian.org>
 
 Package: live-studio-www
 Architecture: all
-Depends: python-django (>= 1.2), python-psycopg2, python-jinja2, python-memcache
+Depends: python-django (>= 1.2), python-psycopg2, python-memcache
 Description: Web pages etc. for live-studio
 
 Package: live-studio-runner

-- 
live-studio