[ruby-qpid/f17: 5/5] Merge branch 'master' into f17

[Vít Ondruch]

commit 49fd923e512e2f3b7227b009c73c27bafb45859b
Merge: 1b6cc52 766254d
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Feb 28 18:05:39 2012 +0100

    Merge branch 'master' into f17

 ruby-qpid.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---