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

[tomspur]

commit 8886254b36bb750bea947cc0c49db300596cb9d0
Merge: 79ddd65 8fd9ec1
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Thu Dec 8 21:45:51 2011 +0100

    Merge branch 'master' into el6

 python-zmq.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---