From: Kenichi Handa <handa@m17n.org>
Date: Fri, 17 Sep 2010 05:07:47 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~117
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=005cbf40d539d48665d7c37d5b09dca280b81c32;p=emacs.git

merge trunk
---

005cbf40d539d48665d7c37d5b09dca280b81c32