Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 06:13:23 +0000 (23:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 06:13:23 +0000 (23:13 -0700)
commit53a35e81c90cec67a21bbc8518bc516ed335d756
treebdf44bf84d4a2c11efdce99245da34e39cb17041
parent19548d0861ced228dd0598240a410bf6a720b59e
parentf330b642bb28e3b9ee5e14ac55c8103e6dcde412
Merge from mainline.
src/ChangeLog