[python-zmq/f14/master: 7/7] Merge branch 'master' into f14

[tomspur]

commit 78b1053353bbeedafdc0a0ea0abe0ab0af59ed1d
Merge: 54b74e4 a0075ca
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Wed Jan 19 13:24:09 2011 +0100

    Merge branch 'master' into f14
    
    - update to new version
    - remove patch (is upstream)
    - run tests differently
    
    Conflicts:
    	.gitignore
    	python-zmq.spec
    	sources
    
    Signed-off-by: Thomas Spura <tomspur at fedoraproject.org>

 .gitignore      |    2 ++
 python-zmq.spec |   39 +++++++++++++++++++++++++--------------
 sources         |    2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)
---
diff --cc python-zmq.spec
index f13ab3c,4610907..ae4e7b4
--- a/python-zmq.spec
+++ b/python-zmq.spec
@@@ -161,6 -168,21 +167,11 @@@ pop
  
  
  %changelog
+ * Thu Jan 13 2011 Thomas Spura <tomspur at fedoraproject.org> - 2.0.10-1
+ - update to new version
+ - remove patch (is upstream)
+ - run tests differently
+ 
 -* Wed Dec 29 2010 David Malcolm <dmalcolm at redhat.com> - 2.0.8-2
 -- rebuild for newer python3
 -
 -* Thu Sep 23 2010 Thomas Spura <tomspur at fedoraproject.org> - 2.0.8-1
 -- update to new version to be comply with zeromp
 -
 -* Sun Aug 22 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.1.20100725git18f5d06-4
 -- rebuild with python3.2
 -  http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html
 -
  * Thu Aug  5 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.1.20100725git18f5d06-3
  - add missing BR for 2to3