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

[Than Ngo]

commit 368f835532f66c25ea7ff8dfde37875161462a3b
Merge: a75542e 4656da0
Author: Than Ngo <than at redhat.com>
Date:   Fri May 18 15:12:15 2012 +0200

    Merge branch 'master' into f17

 qt.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---