From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 17 Oct 2012 21:15:03 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2~7^2~662
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a85d8539c1685b90599a77c5b7872c8ce1a86c2;p=emacs.git

Merge from trunk.
---

9a85d8539c1685b90599a77c5b7872c8ce1a86c2