commit e7e9fa4a6656de124884ce8152e1c67aa71d8379 Merge: a35dee3 f700c1f Author: Erik van Pienbroek epienbro@fedoraproject.org Date: Fri Sep 24 00:09:19 2010 +0200

Merge branch 'master' into f14

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