From: Kenichi Handa <handa@gnu.org>
Date: Mon, 8 Jul 2013 11:55:58 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1888
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6388fe5e472c9bcfcd89b83c5818e7544502377f;p=emacs.git

merge trunk
---

6388fe5e472c9bcfcd89b83c5818e7544502377f