[euca2ools: 17/17] Merge branch 'f13' into f14

[gholms]

commit 421dc347e20cad8f84fbb3a3a700fa946611fe1e
Merge: 263f3af a825ba3
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu Jul 29 21:48:20 2010 -0500

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

---