From: Kenichi Handa <handa@gnu.org>
Date: Sat, 29 Jun 2013 03:44:38 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1991
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=73b1b3ad6196234984a29298bc66eabf1299de66;p=emacs.git

merge trunk
---

73b1b3ad6196234984a29298bc66eabf1299de66