Revert the SVN merge info operation, since it seems to confuse SubVersion 1.8 (maybe I was not supposed to perform those merge info).


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK7@1515760 13f79535-47bb-0310-9956-ffa450edef68