Merge trunk (up to just after swig 2.0.5 release - rev 13009) to gsoc2008-cherylfoil

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-cherylfoil@13017 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/java/reference/index.html

@@ -121,7 +121,7 @@ Click <a href="example.i">here</a> to see a SWIG interface file with these addit
 
 <h2>Sample Java program</h2>
 
-Click <a href="main.java">here</a> to see a Java program that manipulates some C++ references.
+Click <a href="runme.java">here</a> to see a Java program that manipulates some C++ references.
 
 <h2>Notes:</h2>
 

Examples/java/reference/runme.java

@@ -1,6 +1,6 @@
 // This example illustrates the manipulation of C++ references in Java.
 
-public class main {
+public class runme {
   static {
     try {
         System.loadLibrary("example");