update to glib 2.36.2
Merge branch 'upstream' into CoApp

Conflicts:
	build/win32/vs10/gio.vcxproj