merge emacs-23
authorKenichi Handa <handa@etlken>
Fri, 13 Aug 2010 06:35:36 +0000 (15:35 +0900)
committerKenichi Handa <handa@etlken>
Fri, 13 Aug 2010 06:35:36 +0000 (15:35 +0900)

Trivial merge