Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1508463 13f79535-47bb-0310-9956-ffa450edef68
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
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1509316 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1509317 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1510391 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1510395 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1511685 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1511687 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1512215 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch. This merge contains bug fix for problem discovered during the release process:
timezone problem, removal of broken links in generated javadoc and adjustment of bundle filenames.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1512216 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1514390 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


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

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

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