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

[Rex Dieter]

commit 97b27a94875bbc14369418211c3aa18349496ade
Merge: 934f9ee 6e27663
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 29 13:08:46 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	qt.spec

 .gitignore                                         |    1 +
 kde-qt-patches.sh                                  |    6 -
 qconfig-multilib.h                                 |   29 ++----
 qt-4.8.1-webkit-no_Werror.patch                    |   12 +++
 ...ere-opensource-src-4.8.0-QUrl_toLocalFile.patch |   13 ---
 ...rywhere-opensource-src-4.8.0-filter_event.patch |   98 --------------------
 qt.spec                                            |   43 ++++-----
 sources                                            |    2 +-
 webkit-qtwebkit-2.2-no_Werror.patch                |   12 ---
 9 files changed, 45 insertions(+), 171 deletions(-)
---