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

@@ -20,7 +20,7 @@ to see a SWIG interface with some constant declarations in it.
 Click <a href="../../../Doc/Manual/Java.html#constants">here</a> for the section on constants in the SWIG and Java documentation.
 <p>
 
-Click <a href="runme.java">here</a> to see a Java program that prints out the values
+Click <a href="main.java">here</a> to see a Java program that prints out the values
 of the constants contained in the above file.</p>
 <h2>Key points</h2>
 <ul>

Examples/java/constants/main.java

@@ -1,6 +1,6 @@
 import java.lang.reflect.*;
 
-public class runme {
+public class main {
   static {
     try {
         System.loadLibrary("example");