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

[gholms]

commit 1da629db3d420724faa5bec5069628ac6049add1
Merge: fbdbc9c 4a82513
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Jul 6 13:33:43 2012 -0700

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

 .gitignore                        |    1 +
 python-boto-2.5.2-emptydata.patch |   19 +++++++++++++++++++
 python26-boto.spec                |   11 ++++++++++-
 sources                           |    1 +
 4 files changed, 31 insertions(+), 1 deletions(-)
---
diff --cc python26-boto.spec
index f1789df,4555ac9..929409a
--- 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.1
+ Version:	2.5.2
  Release:	1%{?dist}
  License:	MIT
  Group:		Development/Languages