From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 15 Apr 2013 13:44:14 +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~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=947aa1c6e77af64fc0ad29910cbe1a3430b5f088;p=emacs.git

Merge from trunk.
---

947aa1c6e77af64fc0ad29910cbe1a3430b5f088