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

[Bohuslav Kabrda]

commit 60a4adff46693e550934c9f4e73507caf1957324
Merge: f8554ed 317a62a
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jun 11 09:48:24 2012 +0200

    Merge branch 'master' into f17

 ruby.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---