]> code.delx.au - gnu-emacs/commitdiff
merge trunk
authorKenichi Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (21:04 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (21:04 +0900)

Trivial merge