From: Kenichi Handa <handa@m17n.org>
Date: Wed, 25 Aug 2010 04:06:15 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~240^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e87480069cbb711f5ebd2a9d2592dabd8147f57a;p=emacs.git

merge trunk
---

e87480069cbb711f5ebd2a9d2592dabd8147f57a