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

[Than Ngo]

commit 1650d55936fa92584f6c6002d18429c8207a4c0d
Merge: fa6c900 118f765
Author: Than Ngo <than at redhat.com>
Date:   Tue May 29 12:36:14 2012 +0200

    Merge branch 'master' into f17

 ...e-opensource-src-4.8.1-linguist_qmake-qt4.patch |   19 +++++++++++--------
 qt.spec                                            |    5 ++++-
 2 files changed, 15 insertions(+), 9 deletions(-)
---