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

[Vít Ondruch]

commit b842da0db39adf226a9d81ddad93d3ab68cd8c43
Merge: 24c71d8 16dead8
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Jun 15 08:54:23 2012 +0200

    Merge branch 'master' into f17

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