Merge commit 'upstream/1.11.2'
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jun 2011 13:39:20 +0000 (16:39 +0300)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Tue, 28 Jun 2011 13:39:20 +0000 (16:39 +0300)
commit86972ffb9b35b5b88c215dc5b64eef04e15e3ce6
treed5c7c16f16eeff058656ed449a088d91293ecb9b
parent417f8a2fa3b6412ae81d22253ee6f3f05bd21511
parent2bb536d47e3fa1fc22cc2aa03d35919c92937eb6
Merge commit 'upstream/1.11.2'

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