fix a mostly harmless error introduced by svn merge.