Merge commit 'upstream/2_rc1' into experimental

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/requests
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	lang/numpy.i
	texinfo/Makefile.in

diff --cc lang/numpy.i
index 37570777e1d8514f43b956fba18f3cd9b7b385cd,25d1f1a2e2cba54352ff66a822871a491acbf7ae..2106bdce362af08e228dbe361f197292875fd72e
--- 1/lang/numpy.i
--- 2/lang/numpy.i
+++ b/lang/numpy.i
@@@ -111,7 -111,7 +111,11 @@@
      if (PyModule_Check(  py_obj)) return "module"      ;
      if (PyInstance_Check(py_obj)) return "instance"    ;
  
++<<<<<<< HEAD
 +    return "unknown type";
++=======
+     return "unknow type";
++>>>>>>> upstream/2_rc1
    }
  
    /* Given a NumPy typecode, return a string describing the type.