Merging from releases/1.6@3944:4025

svn merge -r3944:4025 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4032 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/build.xml b/build.xml
index 4efa2f8..6b8bcc9 100755
--- a/build.xml
+++ b/build.xml
@@ -7,9 +7,9 @@
   <property name="target" value="build" />
 
   <property name="gwt.apicheck.config" 
-    location="tools/api-checker/config/gwt14_15userApi.conf"/>
+    location="tools/api-checker/config/gwt15_16userApi.conf"/>
   <property name="gwt.apicheck.oldroot" 
-    location="../gwt-1.4"/>
+    location="../gwt-1.5"/>
 
   <target name="dist" depends="dev, user, servlet, tools, jni, doc, samples" description="Run the distributions">
     <gwt.ant dir="distro-source" />