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

[epienbro]

commit ead5d5804b201bfcc36337ff401cbe8230e36507
Merge: 12d2e8e bb4d751
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Dec 21 17:43:05 2011 +0100

    Merge branch 'master' into f16

 .gitignore      |    1 +
 mingw32-qt.spec |    7 +++++--
 sources         |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---