[python-requests/f18: 3/3] Merge branch 'master' into f18

[Toshio くらとみ]

commit 3de3e1b89ec8a4098d0e6dd6a04c936cf36ae354
Merge: 2ac15d5 ad43998
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 8 13:04:29 2013 -0800

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

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