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

Merge from trunk.
---

f1aa11971a74b7b2fa0f5baaaaf21dfbd388de6b