From: Kenichi Handa <handa@etlken>
Date: Thu, 22 Apr 2010 04:07:11 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-23.1.97~22
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8404c468113fb4189fe7d884959172987d650b78;p=emacs.git

merge trunk
---

8404c468113fb4189fe7d884959172987d650b78