merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 15 Oct 2010 00:43:23 +0000 (09:43 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 15 Oct 2010 00:43:23 +0000 (09:43 +0900)

Trivial merge