typo fix: the tattoo identifier may be different from 4
added (incomplete) documentation for the PROP_LOCK_CONTENT property, and listed it in the channel property list and the layer property list
Merge branch 'master' of git://git.gnome.org/gimp
Merge branch 'master' of git://git.gnome.org/gimp