From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Sep 2010 01:09:22 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~138^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2333c84afd9263abd5c71b4503435c5db1292f94;p=emacs.git

merge trunk
---

2333c84afd9263abd5c71b4503435c5db1292f94