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

merge trunk
---

38cc06d9c47e11c8cddfa39c3e09c18bc33071f3