Merged trunk

This commit is contained in:
Chris Behrens 2011-06-29 08:29:35 -07:00
commit 19b1ec4eae

View File

@ -7,7 +7,7 @@ amqplib==0.6.1
anyjson==0.2.4
boto==1.9b
carrot==0.10.5
eventlet==0.9.12
eventlet
lockfile==0.8
python-novaclient==2.5.3
python-daemon==1.5.5