[python-pip/f13/master: 6/6] Merge branch 'master' into f13

[Peter Halliday]

commit 8a8e8562c690ce554e5b7aa94c9b4e30a11840ae
Merge: 77893e1 3155cdf
Author: Peter Halliday <hoangelos at fedora13.(none)>
Date:   Tue Aug 31 16:31:08 2010 -0400

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

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