From: Joakim Verona <joakim@verona.se>
Date: Tue, 9 Aug 2011 07:20:14 +0000 (+0200)
Subject: merge upstream.
X-Git-Tag: emacs-25.0.90~3465
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/1e26d437b871eb5aacaf18a85fba928ef8ea25be

merge upstream.
---

1e26d437b871eb5aacaf18a85fba928ef8ea25be