[python26-boto/el5: 9/15] Merge remote branch 'origin/master' into el6

[gholms]

commit 5da92bd6f30e6f92137caf21f6ff082494d67423
Merge: 63fa425 8093a3b
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Aug 15 21:28:14 2011 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                      |    2 +-
 python-boto-1.9b-image.patch    |   42 -------------
 python-boto-1.9b-prefix.patch   |   15 -----
 python-boto-1.9b-python24.patch |  121 ---------------------------------------
 python-boto-1.9b-python27.patch |   27 ---------
 python-boto.spec                |   28 +++++----
 sources                         |    2 +-
 7 files changed, 18 insertions(+), 219 deletions(-)
---