[python-zmq/el6: 15/15] Merge branch 'master' into el6

[tomspur]

commit 15aa20d36c4b467c5936186f7bfd5ec213329250
Merge: 6fe59b7 9c45c1e
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Wed Sep 21 15:55:55 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-zmq.spec
    	sources
    Update to 2.1.9

 .gitignore      |    6 +++
 python-zmq.spec |  127 +++++++++++++++++++++++++++++++++++++++++++-----------
 sources         |    2 +-
 3 files changed, 108 insertions(+), 27 deletions(-)
---