[python26-boto/el5: 2/2] Merge remote-tracking branch 'python-boto/master' into el5

[gholms]

commit fbdbc9c429fbcd4407bdb2bc6570cbf0e98a16d5
Merge: a1721f9 82f8daa
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu Jun 14 10:25:56 2012 -0700

    Merge remote-tracking branch 'python-boto/master' into el5
    
    Conflicts:
    	python26-boto.spec
    	sources

 .gitignore         |    2 +-
 python26-boto.spec |    5 ++++-
 sources            |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc python26-boto.spec
index 46a82b6,9708f06..f1789df
--- a/python26-boto.spec
+++ b/python26-boto.spec
@@@ -8,8 -2,8 +8,8 @@@
  %global pkgname boto
  
  Summary:	A simple lightweight interface to Amazon Web Services
 -Name:		python-boto
 +Name:		python%{__python_ver}-boto
- Version:	2.5.0
+ Version:	2.5.1
  Release:	1%{?dist}
  License:	MIT
  Group:		Development/Languages