From: Kenichi Handa <handa@m17n.org>
Date: Wed, 22 Aug 2012 09:05:50 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~471^2~2
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/fabc1281e9cde34ff9a19d843316d2ceca8647ad

merge trunk
---

fabc1281e9cde34ff9a19d843316d2ceca8647ad