Revert the previous SVN merge info.

git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1515757 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK7 branch, with omission of java.nio.file.spi.FileTypeDetector service.


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


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


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


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


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


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


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


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1519087 13f79535-47bb-0310-9956-ffa450edef68
Fix for SIS-132 Better support for eclipse IDE contributed by Olivier NOUGUIER.

git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1519284 13f79535-47bb-0310-9956-ffa450edef68
Patch for SIS-133 ResourceCompilerMojo should execute only when properties files are modifiedcontributed by Olivier Nouguier.

git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1519304 13f79535-47bb-0310-9956-ffa450edef68
Documentation, formatting, and update for NetBeans.


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


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