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

[Rex Dieter]

commit 1ac4fa717c388449346d7bad43021d6423923254
Merge: 37b4262 cdf7008
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu May 10 12:22:50 2012 -0500

    Merge branch 'master' into f17

 qt.spec |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)
---