SVN merge info.

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