From: Kenichi Handa <handa@m17n.org>
Date: Thu, 26 Aug 2010 00:28:08 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~237
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41a5c5c417bf605499fdfa16d96cd93fa4fca6a5;p=emacs.git

merge trunk
---

41a5c5c417bf605499fdfa16d96cd93fa4fca6a5