[rubygem-main/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit f8575d1e96b6aa6607669e4b295b90827a4b48ab
Merge: 5a5c043 dfa5481
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Mar 1 12:34:41 2012 +0100

    Merge branch 'master' into f17

 .gitignore        |    1 +
 rubygem-main.spec |   81 ++++++++++++++++++++++++++++------------------------
 sources           |    2 +-
 3 files changed, 46 insertions(+), 38 deletions(-)
---