[qt/f17: 3/3] Merge branch 'master' into f17

[Than Ngo]

commit fa6c900f93842f37887abb36a3b8209143549a79
Merge: 368f835 4d4b19d
Author: Than Ngo <than at redhat.com>
Date:   Tue May 22 17:15:39 2012 +0200

    Merge branch 'master' into f17

 .gitignore                                         |    1 +
 qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch   |   27 --------------------
 qt-everywhere-opensource-src-4.8.0-qvfb.patch      |   12 ---------
 ...erywhere-opensource-src-4.8.1-QTBUG-24718.patch |   14 ----------
 qt.spec                                            |   23 +++++-----------
 sources                                            |    2 +-
 6 files changed, 9 insertions(+), 70 deletions(-)
---