From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 13 Nov 2012 14:17:18 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2~7^2~654
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c4ca7155293ffc2d04708007131bcbc882d8913;p=emacs.git

Merge from trunk.
---

3c4ca7155293ffc2d04708007131bcbc882d8913