Specify full paths for '-I' and '-L'
Add a locale for the XFree86 keysyms
Merge branch 'master' into latin1

Conflicts:
	locales.h