Merge from emacs--rel--22
commit7b1019e2781472c793d0bf74e2b9ee17894270b8
authorMiles Bader <miles@gnu.org>
Thu, 8 May 2008 09:59:56 +0000 (8 09:59 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 8 May 2008 09:59:56 +0000 (8 09:59 +0000)
treef4ac309067b0022e82cb2553fbde465e538e530f
parent0ab5c2be341094f6e5cc440a34401f369ec3d0a9
parent1da6c70183ee4c12114caf6276a764ddd3125da8
Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1150
lisp/ChangeLog
lisp/org/org.el