[python-setuptools: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-setuptools

[Toshio くらとみ]

commit afefd205058a2aeaab6f2a0ebcb11de62d6e8551
Merge: a4d5040 a064d3c
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Jul 23 07:58:40 2012 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-setuptools
    
    Conflicts:
    	python-setuptools.spec

 python-setuptools.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc python-setuptools.spec
index 2ea7168,b979bf5..1dc1a9a
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@@ -152,11 -149,9 +152,14 @@@ rm -rf %{buildroot
  %endif # with_python3
  
  %changelog
 +* Mon Jul 23 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.28-1
 +- New upstream release:
 +  - python-3.3 fixes
 +  - honor umask when setuptools is used to install other modules
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.27-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Mon Jun 11 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.27-2
  - Fix easy_install.py having a python3 shebang in the python2 package