[zeromq/f13/master: 10/10] Merge branch 'master' into f13

[tomspur]

commit 358484f8c0a08fd29d457ed31eb2913a9a1c3b7b
Merge: d50d233 21335c1
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Wed Apr 6 11:17:46 2011 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	zeromq.spec

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