ChangeLog merge fix.
commite6df29f90e195fcdb9350985db69f6aed8952fa7
authorGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:18:55 +0000 (13 09:18 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:18:55 +0000 (13 09:18 -0800)
treeea62ab9488c3d3a956c67b48eeb3b3f5232c3c03
parentf49d1f52b2e368ef67dcfececd426de958548f4e
ChangeLog merge fix.
doc/emacs/ChangeLog