[python-boto/el6/master: 9/9] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 63fa42562acbadd579418915c0154354d2cff367
Merge: a7289c4 73b1fdc
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jan 3 00:04:56 2011 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	python-boto.spec

 python-boto-1.9b-prefix.patch   |   15 +++++
 python-boto-1.9b-python24.patch |  121 +++++++++++++++++++++++++++++++++++++++
 python-boto-1.9b-python27.patch |   27 +++++++++
 python-boto.spec                |   24 +++++++-
 4 files changed, 184 insertions(+), 3 deletions(-)
---