Merge from the JDK7 branch. Contains feature work and a new map projection.


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