From: Kenichi Handa <handa@m17n.org>
Date: Fri, 28 Jan 2011 12:36:18 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~98
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10339fa90363cf20a9e379c083df83405718302d;p=emacs.git

merge trunk
---

10339fa90363cf20a9e379c083df83405718302d