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

[epienbro]

commit b1043b94d8757acd98c43aa685830bdf72ed9be3
Merge: e7e9fa4 0021369
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Oct 12 00:21:43 2010 +0200

    Merge branch 'master' into f14

 .gitignore         |    1 +
 mingw32-glib2.spec |    9 ++++++---
 sources            |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---