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

[Than Ngo]

commit c2e696277e9ab4d24c77c9c843367db109d65fec
Merge: 8361e71 82200be
Author: Than Ngo <than at redhat.com>
Date:   Tue Jun 19 13:21:45 2012 +0200

    Merge branch 'master' into f16

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