]> code.delx.au - gnu-emacs/commitdiff
Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 24 Nov 2012 12:48:55 +0000 (14:48 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 24 Nov 2012 12:48:55 +0000 (14:48 +0200)

Trivial merge