WIKI (non-wysiwyg) editor buttons generate wrong markup in xwiki/2.0 syntax

When editing a document using the non-wysiwyg editor (the "wiki" editor) and editing a document in xwiki/2.0 mode the help buttons above the editor input pane for Bold, Italics, Links etc insert incorrect markup for xwiki/2.0 mode: bold for instance enters "* Bold " instead of "* Bold **", italics enters ~_italics~ etc.
Since my users are already very confused about the many ways you can edit your document (xwiki/1.0 inwiki mode, xwiki/1.0 in wysiwyg mode etc) and since many combinations cause trouble this bug is a problem.

If the problem cannot be fixed quicky it might be best to completely remove the buttons for now.