From: Stephen Berman <stephen.berman@gmx.net>
Date: Fri, 14 Jun 2013 20:07:55 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/bd358779861f265a7acff31ead40172735af693e

Merge from trunk.
---

bd358779861f265a7acff31ead40172735af693e