[ruby-qt/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit bcb49fe7c83ef088a253610bb2b5b01fe345f25b
Merge: ebe2c81 aff1748
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 12:21:32 2012 -0500

    Merge branch 'master' into f16

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