Merge from trunk.

This commit is contained in:
Naveed Massjouni 2011-08-08 20:25:31 -04:00
commit 0791cc21af

View File

@ -10,7 +10,7 @@ carrot==0.10.5
eventlet
lockfile==0.8
lxml==2.3
python-novaclient==2.5.9
python-novaclient==2.6.0
python-daemon==1.5.5
python-gflags==1.3
redis==2.0.0