From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 16 Apr 2013 14:10:51 +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~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83b9062422faef46592618bed64e5df47fe13670;p=emacs.git

Merge from trunk.
---

83b9062422faef46592618bed64e5df47fe13670