Merge branch 'master' into eucalyptus-devel
authorMarco Yuen <marcoy@gmail.com>
Wed, 6 Jul 2011 18:20:59 +0000 (14:20 -0400)
committerMarco Yuen <marcoy@gmail.com>
Wed, 6 Jul 2011 18:20:59 +0000 (14:20 -0400)
commitb9e582564804f4538056758e86dee84c8fc5e6f5
tree5d155e2502595ea0239a54a98288da96529ec9b4
parentff44908aea21a8387c6548d41e78db53b0cec039
parentd1618de5ce6d251957494931d62ef19e21edabee
Merge branch 'master' into eucalyptus-devel
sfa/managers/aggregate_manager_eucalyptus.py