]> code.delx.au - gnu-emacs/commitdiff
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 29 Jan 2010 11:13:16 +0000 (06:13 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 29 Jan 2010 11:13:16 +0000 (06:13 -0500)

Trivial merge