merge

diff --cc gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
index 188e516e2601d09ae43b332720a768ccc5710362,65bd8c56aadd4e992e6b8cb33eadfc924ffceeba..ee35efa2fdc89afaea83b12624c4a31befd56f6e
--- 1/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
--- 2/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryAjaxTestGwt.java
@@@ -26,7 -24,8 +26,6 @@@ import com.google.gwt.junit.client.GWTT
  import com.google.gwt.query.client.builders.Name;
  import com.google.gwt.query.client.builders.XmlBuilder;
  import com.google.gwt.query.client.plugins.ajax.Ajax;
--import com.google.gwt.query.client.plugins.ajax.Ajax.Settings;
  import com.google.gwt.user.client.ui.HTML;
  import com.google.gwt.user.client.ui.RootPanel;
  
@@@ -173,7 -265,7 +172,7 @@@ public class GQueryAjaxTestGwt extends 
      String testJsonpUrl = "http://www.google.com";
      Ajax.getJSONP(testJsonpUrl, null, new Function(){
        public void f() {
--        Properties p = getDataProperties();
++        Properties p = arguments(0);
          assertNull(p);
          finishTest();
        }