From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 7 Oct 2012 13:37:05 +0000 (+0200)
Subject: Merge from mainline.
X-Git-Tag: emacs-24.3.90~173^2~7^2~677
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25d99a950debf417295e68a7a7d519b4ddf3e546;p=emacs.git

Merge from mainline.
---

25d99a950debf417295e68a7a7d519b4ddf3e546