[mingw32-glib2/f15/master: 2/2] Merge branch 'master' into f15

[epienbro]

commit dcbc6460c1c09d78c5bc45bcafef0879df77d2d9
Merge: 2f9ef83 34e8dba
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Apr 23 13:29:00 2011 +0200

    Merge branch 'master' into f15

 .gitignore         |    1 +
 mingw32-glib2.spec |   25 ++++++++++---------------
 sources            |    2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)
---