resolved compilation warnings
addressed a compilation warning on Mac OS X
Merge remote branch 'upstream/master'

Conflicts:
	glib-core/unicode.h