merge emacs-23
authorKenichi Handa <handa@m17n.org>
Sat, 19 Feb 2011 10:46:49 +0000 (19:46 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 19 Feb 2011 10:46:49 +0000 (19:46 +0900)

Trivial merge