From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 Mar 2013 07:24:44 +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~62
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc4cb8d51872fd090f3485b100f192fbef5be92a;p=emacs.git

Merge from trunk.
---

dc4cb8d51872fd090f3485b100f192fbef5be92a