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

[Rex Dieter]

commit 499fde8b2accb65dffd18cc378d433e23f480854
Merge: c2e6962 7f431fb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 6 07:29:26 2012 -0500

    Merge branch 'master' into f16

 ...-cursor-truncate-to-include-line-position.patch |   32 ++++++++++++++++++++
 qt.spec                                            |    8 ++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---