Merge branch 'master' into el6

Conflicts:
	.gitignore
	python-pip.spec
	sources

.gitignore

@@ -1 +1,2 @@
 pip-0.7.2.tar.gz
+/pip-0.8.tar.gz

python-pip.spec

@@ -3,7 +3,7 @@
 %global srcname pip
 
 Name:           python-%{srcname}
-Version:        0.7.2
+Version:        0.8
 Release:        1%{?dist}
 Summary:        Pip installs packages.  Python packages.  An easy_install replacement
 
@@ -37,6 +37,8 @@ pip is meant to improve on easy_install.bulletin boards, etc.).
 %install
 %{__rm} -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__rm} -rf %{buildroot}%{_bindir}/pip-*
+mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip-python
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -44,15 +46,20 @@ pip is meant to improve on easy_install.bulletin boards, etc.).
 %files
 %defattr(-,root,root,-)
 %doc PKG-INFO docs
-%attr(755,root,root) %{_bindir}/pip
+%attr(755,root,root) %{_bindir}/pip-python
 %{python_sitelib}/pip*
 
 %changelog
+* Mon Aug 30 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.8-1
+- update to 0.8 of pip
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Wed Jul 7 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.2-1
 - update to 0.7.2 of pip
-* Sat Mar 5 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.3-1
-- update to 0.6.3 of pip
-* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorssytems.net> - 0.6.1.4
+* Sun May 23 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.1-1
+- update to 0.7.1 of pip
+* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
 - fix dependency issue
 * Tue Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
 - fix spec file 

sources

@@ -1 +1 @@
-cfe73090aaa0d3b0c104179a627859d1  pip-0.7.2.tar.gz
+468d9adc309f33ad51cee38f0d455429  pip-0.8.tar.gz