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

[Rex Dieter]

commit e86eaa89ee0be3a5bc31f957c1e0139b0f491658
Merge: 5d8ae35 5d4c00c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Aug 13 18:38:10 2012 -0500

    Merge branch 'master' into f17

 ...sh-on-x86-64-avoid-32-bit-branch-offset-o.patch |  284 ++++++++++++++++++++
 qt.spec                                            |   10 +-
 2 files changed, 293 insertions(+), 1 deletions(-)
---