From: Bill Wohler <wohler@newt.com>
Date: Sun, 9 Dec 2012 01:19:00 +0000 (-0800)
Subject: Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.
X-Git-Tag: emacs-24.3.90~173^2~9
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/e1b489df7af8f7034f8c2ef275b786e93a39df31

Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.
---

e1b489df7af8f7034f8c2ef275b786e93a39df31