From: Kenichi Handa <handa@gnu.org>
Date: Sun, 19 Jan 2014 13:27:34 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~335
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=75f3311ef7f88d1e605b2f3b1b8108e8de9173ca;p=emacs.git

merge trunk
---

75f3311ef7f88d1e605b2f3b1b8108e8de9173ca