From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 17 Apr 2013 16:37:15 +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~30
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76efa828369a583650cf661a327d5698891a7a90;p=emacs.git

Merge from trunk.
---

76efa828369a583650cf661a327d5698891a7a90