[python-requests/f17: 6/6] Merge branch 'f17' of ssh://pkgs.fedoraproject.org/python-requests into f17

[Ralph Bean ☃]

commit ca181ea14e72be94b7c89d153455a6d9dcc6252f
Merge: fae896e 79e36b0
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Feb 28 12:42:33 2013 -0500

    Merge branch 'f17' of ssh://pkgs.fedoraproject.org/python-requests into f17
    
    Conflicts:
    	python-requests.spec

---