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

[tomspur]

commit bd14a68a20e5584bc3dc8b3ee7f8bd9419da884e
Merge: 8886254 6d9942d
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Wed Dec 14 10:53:48 2011 +0100

    Merge branch 'master' into el6

 python-zmq.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---