[zeromq/el6: 2/2] Merge branch 'master' into el6

[tomspur]

commit 95cd2c58c4aa4b67768a7af4f7851e0bd96686a5
Merge: 1dba4b3 541d320
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Mon Jan 14 09:35:35 2013 +0100

    Merge branch 'master' into el6

 zeromq.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---