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

[Than Ngo]

commit c3c8eaaaa9a6d6fa85987b43104ec2a82eeb0e7c
Merge: 1650d55 82200be
Author: Than Ngo <than at redhat.com>
Date:   Tue Jun 19 13:07:09 2012 +0200

    Merge branch 'master' into f17

 ...ere-opensource-src-4.8.2--assistant-crash.patch |   13 +++++++++++++
 qt.spec                                            |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---