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

[Vít Ondruch]

commit f26090b664dc6968a25eb6e6320929a241d6102c
Merge: 33b7410 1d7ed77
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Mar 2 12:07:16 2012 +0100

    Merge branch 'master' into f17

 ruby-romkan.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---