Add missing CGColor property to NSImage (Mountain Lion only)
Merge branch 'master' of https://github.com/mono/monomac into upstream
Merge branch 'upstream'

Conflicts:
	src/appkit.cs