Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 May 2011 00:09:23 +0000 (17:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 23 May 2011 00:09:23 +0000 (17:09 -0700)
commitaf3d522ffbf83826f80ab8f6d811e19e97c37384
tree4f3d6047a2e0a30c8374f2da5e02858b0129edac
parent37910ab2514f67d12c5b20b63ec6333c02df43c1
parent7400048f602459209e89da4680ed9cc351ace4ee
Merge from trunk.
src/ChangeLog