From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 30 Mar 2013 06:34:05 +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~64
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=627d532608d03416763595cb5077dacb1238f948;p=emacs.git

Merge from trunk.
---

627d532608d03416763595cb5077dacb1238f948