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

[Bohuslav Kabrda]

commit f8554ed4bd2ffb577b22328b5030de5a9f2c9f31
Merge: 0de5456 7156dc7
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Wed May 30 14:01:17 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	ruby.spec

 .gitignore |    1 +
 ruby.spec  |   21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
---