fix small conflicts of VT ans MM`s rev 612

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/robustbase@619 694ef91d-65df-0310-b7bb-92e67a308ead