[mingw32-glib2/f14/master: 4/4] Merge branch 'master' into f14

[epienbro]

commit a35dee31286553b18dcd36dc5270aa470ce48e28
Merge: 76c6424 f0449a1
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sun Sep 12 17:26:55 2010 +0200

    Merge branch 'master' into f14

 .gitignore         |    2 ++
 mingw32-glib2.spec |   23 +++++++++++++++++++----
 sources            |    2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)
---