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/template/index.html

@@ -85,7 +85,7 @@ Note that SWIG parses the templated function <tt>max</tt> and templated class <t
 
 <h2>A sample Java program</h2>
 
-Click <a href="runme.java">here</a> to see a Java program that calls the C++ functions from Java.
+Click <a href="main.java">here</a> to see a Java program that calls the C++ functions from Java.
 
 <h2>Notes</h2>
 Use templated classes just like you would any other SWIG generated Java class. Use the classnames specified by the %template directive.

Examples/java/template/main.java

@@ -1,6 +1,6 @@
 // This example illustrates how C++ templates can be used from Java.
 
-public class runme {
+public class main {
   static {
     try {
         System.loadLibrary("example");