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

Merge from trunk.
---

cf2d22b874ca2df0072e32ee641e8efffe4abd6d