[ruby-korundum/f16: 18/18] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit c445b2fec06a442eeeeb065305c592088620b127
Merge: bfcb65c e8272f4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 23:39:43 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	ruby-korundum.spec
    	sources

 .gitignore                  |    2 +-
 korundum-4.8.0-ruby19.patch |   30 ++++++++++++++
 ruby-korundum.spec          |   90 +++++++++++++++++++++++++++++++++---------
 sources                     |    2 +-
 4 files changed, 102 insertions(+), 22 deletions(-)
---