From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 11 Dec 2013 17:06:50 +0000 (+0200)
Subject: Another merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~446^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ec6c340e90369b5921b35bed3bd4cfc0368723e;p=emacs.git

Another merge from trunk.
---

0ec6c340e90369b5921b35bed3bd4cfc0368723e