[euca2ools/el5/master: 15/15] Merge branch 'master' into el5

[gholms]

commit 2a90edc14ee009b4d6d7c933e255b51d89dc8721
Merge: 82c4877 5b4aab0
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu May 5 10:55:13 2011 -0700

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

 euca2ools-1.3.1-fsid.patch        |   18 +++++++++++-------
 euca2ools-1.3.1-mkfsopt.patch     |   29 +++++++++++++++++++++++++++++
 euca2ools-1.3.1-smallbundle.patch |   17 +++++++++++++++++
 euca2ools.spec                    |   16 +++++++++++++++-
 4 files changed, 72 insertions(+), 8 deletions(-)
---
diff --cc euca2ools.spec
index 54e4d5b,a49c313..526d558
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@@ -58,16 -52,21 +58,22 @@@ Patch19:        euca2ools-1.3.1-srcnet.
  Patch20:        euca2ools-1.3.1-boto20.patch
  # https://bugzilla.redhat.com/show_bug.cgi?id=684976
  Patch21:        euca2ools-1.3.1-euca20.patch
+ # https://bugs.launchpad.net/euca2ools/+bug/760157
+ Patch22:        euca2ools-1.3.1-smallbundle.patch
+ # https://bugs.launchpad.net/euca2ools/+bug/771498
+ Patch23:        euca2ools-1.3.1-mkfsopt.patch
  
 -Requires:       m2crypto
 -Requires:       python-boto
 +Requires:       python%{?__python_ver}-m2crypto
 +Requires:       python%{?__python_ver}-boto
+ Requires:       rsync
+ Requires:       util-linux
  
  BuildRequires:  help2man
 -BuildRequires:  python-devel
 -BuildRequires:  python-setuptools-devel
 +BuildRequires:  python%{?__python_ver}-devel
 +BuildRequires:  python%{?__python_ver}-setuptools
  
  BuildArch:      noarch
 +BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
  %description
  Eucalyptus is an open source service overlay that implements elastic