From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 16 Apr 2013 16:57:06 +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~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19c443d277831d6d128d2e6a4e300258b8666bea;p=emacs.git

Merge from trunk.
---

19c443d277831d6d128d2e6a4e300258b8666bea