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

Merge from trunk.
---

6d03e7beda333663080a64af902231342fd941cf