From: Kenichi Handa <handa@gnu.org>
Date: Thu, 23 May 2013 12:04:26 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~227
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=179a3f11d15cbc6e433f05e03cc7e40fd5ce8362;p=emacs.git

merge trunk
---

179a3f11d15cbc6e433f05e03cc7e40fd5ce8362