merging in changes from old branch.
merging in changes from old branch.
jhajek/euca2ools,nagyistoce/euca2ools,nagyistoce/euca2ools,vasiliykochergin/euca2ools,vasiliykochergin/euca2ools,gholms/euca2ools,gholms/euca2ools,jhajek/euca2ools