From: Kenichi Handa <handa@etlken>
Date: Thu, 8 Jul 2010 08:09:35 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80d4189187791916590b6c2b20b54588d432bb75;p=emacs.git

merge trunk
---

80d4189187791916590b6c2b20b54588d432bb75