[ruby-qt/f18: 8/8] Merge branch 'master' into f18

[Rex Dieter]

commit 74703304b080a4e75856ecb0a13dd71646417ccd
Merge: a719f6d aa9bdee
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 18:26:04 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	ruby-qt.spec
    	sources

 .gitignore   |    7 +------
 ruby-qt.spec |   25 ++++++++++++++++++++-----
 sources      |    2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)
---