[python-zmq/el6: 6/7] Merge commit '52a009b9d6d9348c65347b4ee01d2d1dfd8f0f40' into el6

[tomspur]

commit 392a25555816251adf1f4a5b2171f8d562f57137
Merge: bd14a68 52a009b
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Mon Oct 15 10:54:06 2012 +0200

    Merge commit '52a009b9d6d9348c65347b4ee01d2d1dfd8f0f40' into el6

 .gitignore      |    2 ++
 python-zmq.spec |   21 ++++++++++++++++++---
 sources         |    2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)
---