Merge commit 'upstream/2_rc1' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 26 Sep 2011 20:51:46 +0000 (23:51 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Mon, 26 Sep 2011 20:51:46 +0000 (23:51 +0300)
commit25e06076520a0972241384652c0472644cf5f005
tree563e8c362513c4579e656f2a62b12515fe3bc5ab
parentc3a90a2ff9d323eb36f8dbb404fa92af604ca4af
parentb66b7fd35f67e1090087241c74ba9ab11976622e
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
lang/numpy.i