From: Kenichi Handa <handa@gnu.org>
Date: Tue, 31 Dec 2013 15:04:57 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~120
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6fc286aee5eb67bf4acb9f67c3b5d363ee4b427b;p=emacs.git

merge trunk
---

6fc286aee5eb67bf4acb9f67c3b5d363ee4b427b