ChangeLog fixes:
authorGlenn Morris <rgm@gnu.org>
Wed, 16 Nov 2011 18:21:51 +0000 (10:21 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 16 Nov 2011 18:21:51 +0000 (10:21 -0800)
commit9d0cfcd67ddcfb664cef507b76dd439b3b7de805
tree00e56c33d431a98437247b94b57bb4e679ea9c90
parent7877f37394a0bea045c8d0faf7db7a7e1b4ccdc1
ChangeLog fixes:

python-pdbtrack-stack-entry-regexp was not changed.
Mark an odd kind of change with no real attribution as tiny.
Remove conflict marker.
lisp/ChangeLog