merge emacs-23
authorKenichi Handa <handa@m17n.org>
Wed, 25 May 2011 02:45:30 +0000 (11:45 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 25 May 2011 02:45:30 +0000 (11:45 +0900)

Trivial merge