From: Kenichi Handa <handa@m17n.org>
Date: Wed, 24 Aug 2011 07:35:02 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~70^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd294c6932d54a1ce8f56b10468f42bec90c5c74;p=emacs.git

merge trunk
---

fd294c6932d54a1ce8f56b10468f42bec90c5c74