From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 18 Oct 2012 18:19:55 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2~7^2~658
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81f8ee3ff0b25c479c6a8095d32d762610009e29;p=emacs.git

Merge from trunk.
---

81f8ee3ff0b25c479c6a8095d32d762610009e29