More merge fixes.
authorJuanma Barranquero <lekktu@gmail.com>
Sun, 31 Oct 2010 18:38:16 +0000 (19:38 +0100)
committerJuanma Barranquero <lekktu@gmail.com>
Sun, 31 Oct 2010 18:38:16 +0000 (19:38 +0100)
commitf486841f693606fff8f40a47f9d1a5afcf0a343d
tree94c1441d0778e0efb1865856115455bcfd360116
parentc8c599548191c0d9f903e20d010b076dcd74170a
More merge fixes.
lisp/ChangeLog
lisp/cedet/ChangeLog