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

[Bohuslav Kabrda]

commit 24c71d8fede6d0ac45c70e55380c7fa254319e8d
Merge: 60a4adf 475ac39
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jun 11 10:22:12 2012 +0200

    Merge branch 'master' into f17

 ruby.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---