[python-requests/f17: 7/7] Merge branch 'master' into f17

[Toshio くらとみ]

commit 79e36b0775c4a3101159a0ab5c7ae3ee19770d75
Merge: 97149a4 4d0266e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 8 13:43:29 2013 -0800

    Merge branch 'master' into f17
    
    Conflicts:
    	python-requests.spec

 python-requests-cookie-handling.patch    |   35 ++++++++++++++
 python-requests-system-cert-bundle.patch |   16 ++++++
 python-requests.spec                     |   76 +++++++++++++++++++++++------
 3 files changed, 111 insertions(+), 16 deletions(-)
---