From: Kenichi Handa <handa@etlken>
Date: Mon, 9 Aug 2010 11:05:27 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa151b90b64cc6861629c505badc7d766586b288;p=emacs.git

merge trunk
---

aa151b90b64cc6861629c505badc7d766586b288