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