[mingw-qt/f18: 4/4] Merge branch 'master' into f18

[Erik van Pienbroek]

commit 2d661c1a92e4775204dc7969f179baf9f8d45a3e
Merge: f08e0c0 6aed721
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Dec 11 07:19:27 2012 +0100

    Merge branch 'master' into f18

 .gitignore                                       |    1 +
 mingw-qt.spec                                    |   28 ++++++++------
 qt-4.8.4-fix-sse-suppport-build-regression.patch |   11 ++++++
 qt-commit-0f5f7c.patch                           |   31 ----------------
 qt-commit-57069f.patch                           |   41 ----------------------
 qt-merge-static-and-shared-library-trees.patch   |    2 +-
 sources                                          |    2 +-
 7 files changed, 30 insertions(+), 86 deletions(-)
---