[ruby-spqr/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 76ee812b11babe93d79f43286b1d63d69f7b0839
Merge: 4dd1261 96c013e
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Feb 8 10:21:20 2012 +0100

    Merge branch 'master' into f17

 ruby-spqr.spec |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)
---