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

@@ -143,8 +143,8 @@ extraction.
 
 <ul>
 <li> <a href="example.c">example.c</a>  (C Source)
-<li> <a href="example.i">example.i</a>  (Swig interface)
-<li> <a href="main.java">main.java</a>  (Java program)
+<li> <a href="example.i">example.i</a>  (SWIG interface)
+<li> <a href="runme.java">runme.java</a>  (Java program)
 </ul>
 
 <h2>Notes</h2>

Examples/java/pointer/runme.java

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