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

[Jaroslav Reznik]

commit d68208955acdcdff71d6eaa70df9c599a538907f
Merge: 5aa0de5 20e8a01
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue Apr 3 11:14:24 2012 +0200

    Merge branch 'master' into f17

 ...erywhere-opensource-src-4.8.1-QTBUG-24718.patch |   14 ++++++++++++++
 qt.spec                                            |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---