From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 19 Apr 2013 08:39:24 +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~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4cf86a2fa737296d26e8a02338e2bf6f26e1133a;p=emacs.git

Merge from trunk.
---

4cf86a2fa737296d26e8a02338e2bf6f26e1133a