[python-pip/f12/master: 11/11] Merge branch 'master' into f12

[Peter Halliday]

commit 05b65b4ac6df1f0d0dd3fa13fbcd19e294bda5be
Merge: d9fa02e 3155cdf
Author: Peter Halliday <hoangelos at fedora13.(none)>
Date:   Tue Aug 31 18:09:50 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	python-pip.spec
    	sources

 .gitignore      |    1 +
 python-pip.spec |   17 +++++++++++------
 sources         |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)
---