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

@@ -66,7 +66,7 @@ Here are some files that illustrate this with a simple example:
 <li><a href="example.c">example.c</a>
 <li><a href="example.h">example.h</a>
 <li><a href="example.i">example.i</a> (SWIG interface)
-<li><a href="runme.java">runme.java</a> (Sample program)
+<li><a href="main.java">main.java</a> (Sample program)
 </ul>
 
 <h2>Notes</h2>

Examples/java/funcptr/main.java

@@ -1,5 +1,5 @@
 
-public class runme {
+public class main {
 
   static {
     try {