Resolve the comminted svn merge comment!

ugly stuff....