Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-requests into el6

Conflicts:
	python-requests.spec

python-requests.spec

@@ -28,10 +28,6 @@ BuildRequires:  python2-devel
 BuildRequires:  python-chardet
 BuildRequires:  python-urllib3
 
-Requires:       python-certifi
-%if 0%{?fedora}
-Requires:       python-gevent
-%endif
 Requires:       ca-certificates
 Requires:       python-chardet
 Requires:       python-urllib3
@@ -65,7 +61,6 @@ designed to make HTTP requests easy for developers.
 
 %prep
 %setup -q -n requests-%{version}
-%patch0 -p1 -b .cookies
 
 %patch0 -p1
 %patch1 -p1
@@ -135,7 +130,6 @@ popd
 %endif
 
 %changelog
-
 * Thu Feb 28 2013 Ralph Bean <rbean@redhat.com> - 1.1.0-3
 - Unbundled python-urllib3.  Using system python-urllib3 now.
 - Conditionally include python-ordereddict for el6.