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

[Than Ngo]

commit 8361e71552795c9292208d448f0d23d73eca8f23
Merge: 266a47c 118f765
Author: Than Ngo <than at redhat.com>
Date:   Tue May 29 14:06:23 2012 +0200

    Merge branch 'master' into f16

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