From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Nov 2012 18:13:53 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~79
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f8879751b8dc5e007dd8e8acdea7c7e605a2612;p=emacs.git

Merge from trunk.
---

3f8879751b8dc5e007dd8e8acdea7c7e605a2612