Merge from the JDK6 branch.


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