[python-pip/el6: 14/14] Merge branch 'master' into el6

[Jon Ciesla]

commit 013668ed2fd63a6ff086b3870b3bfc34e56ece4d
Merge: 48b11b2 53e39cd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Apr 26 07:35:40 2013 -0500

    Merge branch 'master' into el6

 .gitignore      |    5 ++
 python-pip.spec |  128 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 sources         |    2 +-
 3 files changed, 125 insertions(+), 10 deletions(-)
---