Merge from trunk.
commitfc83f7d3d422039f041bbcc4f0cb75a1699421ad
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 05:46:16 +0000 (10 22:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 05:46:16 +0000 (10 22:46 -0700)
treeab145d16fb805bf749fcab7f7c70554242eab111
parente41e9a0e24877b0bc81e08df396f59115f8636da
parentcca693976c52acf26f5130848931d274522c69f9
Merge from trunk.
src/ChangeLog
src/buffer.h