The warning shown in wiki manual merge mode was present twice, after the r6986 merge.
The warning shown in wiki manual merge mode was present twice, after the r6986 merge.

pkdevbox/trac,pkdevbox/trac,pkdevbox/trac,pkdevbox/trac