From: Kenichi Handa <handa@m17n.org>
Date: Mon, 16 Jul 2012 22:25:00 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.2.90~471^2~5
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/69c41c4070c86baac11a627e9c3d366420aeb7cc

merge trunk
---

69c41c4070c86baac11a627e9c3d366420aeb7cc