Merging downstream patch from Canonical.  Launchpad bug 509562.
Merging downstream patch from Canonical.  Launchpad bug 509562.
jhajek/euca2ools,nagyistoce/euca2ools,gholms/euca2ools,nagyistoce/euca2ools,jhajek/euca2ools,vasiliykochergin/euca2ools,vasiliykochergin/euca2ools,gholms/euca2ools