Merge from mainline.
commit13c15c6d700e63469a20679651649bd523f9de02
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 00:26:43 +0000 (3 17:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 00:26:43 +0000 (3 17:26 -0700)
treed9b49afb103315016e122295dab5c5cbba6714e2
parent59dba0f4d83541ca638492d137db7723d47faa1e
parentc2f51e23ab57da738bf3d7e1411a28dcfd9da75c
Merge from mainline.
src/ChangeLog