From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 31 Mar 2013 12:36:07 +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~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65d72c1bf862d339d72d760e7ac8ccbc4837f06b;p=emacs.git

Merge from trunk.
---

65d72c1bf862d339d72d760e7ac8ccbc4837f06b