[zeromq/f16: 3/3] Merge branch 'master' into f16

[tomspur]

commit 139ecda563b02f7106d922590bd1e8391ea02c59
Merge: c8596de e847db0
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Wed Sep 21 11:27:07 2011 +0200

    Merge branch 'master' into f16

 .gitignore  |    1 +
 sources     |    2 +-
 zeromq.spec |   10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)
---