From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 24 Apr 2013 19:12:03 +0000 (+0300)
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~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2800c4d3155df0768410a675359fb360dfe2e791;p=emacs.git

Merge from trunk.
---

2800c4d3155df0768410a675359fb360dfe2e791