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

[Vít Ondruch]

commit fe62b1ec08744274c994b76047714058e7e42074
Merge: e10d820 65cb15b
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Aug 14 14:33:05 2012 +0200

    Merge branch 'master' into f18

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