[rubyripper/f13/master: 4/4] Merge remote-tracking branch 'origin/master' into f13

[Felix Kaechele]

commit 59a32a91260c6d74bcf0cfdcab2090d647d0313a
Merge: 47159a9 6d684e3
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sat Mar 19 10:32:29 2011 +0100

    Merge remote-tracking branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore

 rubyripper-0.4.3-makefile.patch  |   58 --------------------------------------
 rubyripper-0.4.4-configure.patch |   21 -------------
 rubyripper.spec                  |   19 ++++++++++--
 sources                          |    2 +-
 4 files changed, 16 insertions(+), 84 deletions(-)
---