Merge from the JDK6 branch.

git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1508466 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info.

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