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

[Rex Dieter]

commit dea4644599fcbfd08919a7b3d4cf8074eba4a478
Merge: e86eaa8 4f64405
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 09:53:33 2012 -0500

    Merge branch 'master' into f17

 qt.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---