Fix merge mistake
authorMiles Bader <miles@gnu.org>
Wed, 30 Jan 2008 08:29:16 +0000 (08:29 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 30 Jan 2008 08:29:16 +0000 (08:29 +0000)
commit9fab8546840e884c123fdd57a4016a79ec8f7a3d
tree231fcdf56bd421022636c11304db0f0423fd6ffc
parentd235ca2ff8fab139ce797757fcb159d1e28fa7e0
Fix merge mistake

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-325
lisp/emacs-lisp/cl-loaddefs.el
lisp/ps-print.el
src/emacs.c