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

[Rex Dieter]

commit 5d8ae350921d98417430203a0000d624db948903
Merge: c3c8eaa 7f431fb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jul 5 13:15:20 2012 -0500

    Merge branch 'master' into f17

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