From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 5 Apr 2013 13:10: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~49
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/eb1dd42a729ab1b9cdcd278767951679480cd4c3

Merge from trunk.
---

eb1dd42a729ab1b9cdcd278767951679480cd4c3