[rubygem-foreigner/f17: 5/5] Merge branch 'master' into f17

[Darryl L. Pierce]

commit cbb3ea775b2e7b1ab039dc11a198f41b21c7be48
Merge: d2f7fc3 71b6604
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Thu Mar 8 08:26:24 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	rubygem-foreigner.spec
    	sources
    
    I absolutely HATE that we can't fix when merge conflicts occur!

 .gitignore             |    1 +
 rubygem-foreigner.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---