[euca2ools/f14/master: 7/7] Merge branch 'master' into f14

[gholms]

commit aa2a69b850ac6f8e9a1c184ddb3be3b11f11c387
Merge: dce4290 4c5a4e8
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Mar 4 11:48:44 2011 -0800

    Merge branch 'master' into f14
    
    Conflicts:
    	euca2ools.spec

 euca2ools-1.3.1-srcnet.patch   |   22 ++++++++++++++++++++++
 euca2ools-1.3.1-userdata.patch |   12 ++++++++++++
 euca2ools.spec                 |   12 +++++++++++-
 3 files changed, 45 insertions(+), 1 deletions(-)
---