From: Kenichi Handa <handa@gnu.org>
Date: Sun, 13 Oct 2013 11:59:25 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1283
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4168439a5f601094f0c0d18f0492d26956c65541;p=emacs.git

merge trunk
---

4168439a5f601094f0c0d18f0492d26956c65541