Fix 2007-08-21 merge conflicts.
authorJuri Linkov <juri@jurta.org>
Wed, 22 Aug 2007 23:45:47 +0000 (23:45 +0000)
committerJuri Linkov <juri@jurta.org>
Wed, 22 Aug 2007 23:45:47 +0000 (23:45 +0000)
commit875ad194619941fc110d1f6b5e724dc9315a10bd
treeac56502a094f7a3b4281084ab912108d9bbbca78
parentaa251046dda67e80ae2d08b04cfeff7c993d89cd
Fix 2007-08-21 merge conflicts.
lisp/startup.el