[python-distutils-extra/el6: 6/6] Merge branch 'master' into el6

[Alan Pevec]

commit ff5c7bd47182746e1b839b1f0324ca5f9d26f1a5
Merge: c5039cc 4c20ac8
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Apr 27 10:25:06 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-distutils-extra.spec
    	sources

 .gitignore                  |    1 +
 python-distutils-extra.spec |    7 +++++--
 sources                     |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc python-distutils-extra.spec
index ce6d498,e8ed417..8b595b0
--- a/python-distutils-extra.spec
+++ b/python-distutils-extra.spec
@@@ -43,6 -43,12 +43,9 @@@ chmod a+x %{buildroot}%{python_sitelib}
  
  
  %changelog
+ * Tue Mar 13 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.32-1
+ - Updated to new upstream version 2.32
+ 
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.31-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
  * Sun Nov 13 2011 Fabian Affolter <mail at fabian-affolter.ch> - 2.31-1
  - Updated to new upstream version 2.31