ChangeLog merge fix.
commita653f276763533708df0da340f27bdcad65cecb7
authorGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:26:01 +0000 (13 09:26 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 13 Dec 2010 17:26:01 +0000 (13 09:26 -0800)
tree7f629a5e3f40447cdb6637ae73c13d0f27212657
parente1115396be405d58d8ca29c349ff9ade5ba4cd69
ChangeLog merge fix.
doc/misc/ChangeLog
etc/ChangeLog