Conflicts:
	vcl/unx/generic/gdi/gdiimpl.cxx
	vcl/unx/generic/gdi/salgdi2.cxx

Change-Id: I2cb960d194ee5bc38beece97e8b21cc6fa3b3fbc