Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 14:46:13 +0000 (07:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Apr 2011 14:46:13 +0000 (07:46 -0700)
commit0a20c80c9cee34a71b975bb37ac811bd339eaf9f
tree5dc019993c292129df8916c61ed608f0094b7b37
parentec8df74431a76616a83806e1c1f4a094731a3f77
parent06b605171f1c9d8b42bd3326a243b8b03d2e4e58
Merge from mainline.
src/ChangeLog