Revert rev 11187 "Merged with recent changes from trunk."

This reverts commit c595e4d90ebfd63eb55430c735bb121cf690bd59.

Conflicts:

	Source/Modules/c.cxx

From: William S Fulton <wsf@fultondesigns.co.uk>

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-maciekd@13033 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="runme.java">here</a> to see a Java program that manipulates some C++ references.
+Click <a href="main.java">here</a> to see a Java program that manipulates some C++ references.
 
 <h2>Notes:</h2>
 

Examples/java/reference/main.java

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