fixing svn spaghetti

SVN-Revision: 4245