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

[tomspur]

commit b6bdc63d3f893f15e2758e156ff9fe039a1dd9c4
Merge: 15aa20d 4155cf5
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Thu Dec 8 21:14:20 2011 +0100

    Merge branch 'master' into el6

 python-zmq.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---