[python-distutils-extra/f14/master: 4/4] Merge branch 'master' into f14

[Fabian Affolter]

commit 71fc4f6b08758b2277751a7eff8378fbc164b3a7
Merge: d9ddc0d 2e359a6
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Thu Mar 17 00:17:05 2011 +0100

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

 .gitignore                  |    2 ++
 dont_import_gtk.patch       |   14 ++++++++++++++
 python-distutils-extra.spec |   15 ++++++++++++---
 sources                     |    4 ++++
 4 files changed, 32 insertions(+), 3 deletions(-)
---
diff --cc python-distutils-extra.spec
index ad9365d,d633f40..7b6cde2
--- a/python-distutils-extra.spec
+++ b/python-distutils-extra.spec
@@@ -38,8 -43,15 +43,12 @@@ chmod a+x %{buildroot}%{python_sitelib}
  
  
  %changelog
+ * Wed Mar 16 2011 Fabian Affolter <fabian at bernewireless.net> - 2.26-1
+ - Added patch for DISPLAY support
+ - Updated to new upstream version 2.26
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.22-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Fri Nov 12 2010 Fabian Affolter <fabian at bernewireless.net> - 2.22-1
- - Remove archive_name from 20100604, this was useless and wrong
+ - Remove archive_name from 2010-06-04, this was useless and wrong
  - Updated to new upstream version 2.22
  
  * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 2.19-2
diff --cc sources
index c8d51c0,ecb0fa3..4a5f60c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +c085b71263c37af48824f8a353475181  python-distutils-extra-2.22.tar.gz
++=======
+ 7caded30a45907b5cdb10ac4182846eb  python-distutils-extra-2.26.tar.gz
++>>>>>>> master