[mingw32-qt-qmake/f16: 3/3] Merge branch 'master' into f16

[epienbro]

commit 8af53d219d5b7dfd8c615cd97525f86af7a62f83
Merge: af5c733 05f723f
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Dec 21 17:40:27 2011 +0100

    Merge branch 'master' into f16

 mingw32-qt-qmake.spec |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---