From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 30 Oct 2011 02:23:07 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~130
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/1fa2385302f5b2e5bb17c8aad3cb4e320512ca46

Merge from trunk.
---

1fa2385302f5b2e5bb17c8aad3cb4e320512ca46