Correct conflicts in previous patch.
authorAlan Mackenzie <acm@muc.de>
Thu, 3 Dec 2009 15:56:29 +0000 (15:56 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 3 Dec 2009 15:56:29 +0000 (15:56 +0000)
commit4267d8591048007bb584bdba9924056d660e0c53
treea59f75d3fcfca9f6575b9b7c35747006e3b4c43a
parent8578c224af8f47f06601ec382bf3f04c478077eb
Correct conflicts in previous patch.
lisp/ChangeLog