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

[tomspur]

commit cb993b1b4c9aea54eb72165d47e3cd0d505e1020
Merge: 9b83360 e847db0
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Wed Sep 21 11:46:19 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	zeromq.spec
    
    update to 2.1.9

 sources     |    2 +-
 zeromq.spec |   61 ++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 24 deletions(-)
---