From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 1 May 2013 17:12:42 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c1a1306117d5c41be1beac981d33085fa0fe5a1;p=emacs.git

Merge from trunk.
---

9c1a1306117d5c41be1beac981d33085fa0fe5a1