From: Kenichi Handa <handa@m17n.org>
Date: Thu, 16 Aug 2012 12:25:17 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~471^2~4
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d75ffb4ed0b2e72a9361a07d16a5c884a9459728

merge trunk
---

d75ffb4ed0b2e72a9361a07d16a5c884a9459728