From: Kenichi Handa <handa@gnu.org>
Date: Sat, 27 Apr 2013 13:35:45 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~358
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=289e303f3da7ad4c8d19181ca6b48d2832098993;p=emacs.git

merge trunk
---

289e303f3da7ad4c8d19181ca6b48d2832098993