Merge branch 'master' into eucalyptus-devel
authorMarco Yuen <marcoy@gmail.com>
Mon, 25 Jul 2011 16:05:31 +0000 (12:05 -0400)
committerMarco Yuen <marcoy@gmail.com>
Mon, 25 Jul 2011 16:05:31 +0000 (12:05 -0400)
commitfc4b3be087bdf9daa44cf701d22f6798869f5577
tree008073995b8dc33059dd38564c00712372f63b80
parentb9e582564804f4538056758e86dee84c8fc5e6f5
parent1034611f6146fb19b332bfc71f0c91418435b491
Merge branch 'master' into eucalyptus-devel

Conflicts:
sfa/managers/aggregate_manager_eucalyptus.py
sfa/managers/aggregate_manager_eucalyptus.py