From: Glenn Morris <rgm@gnu.org>
Date: Sun, 6 Jan 2013 20:34:54 +0000 (-0800)
Subject: Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org
X-Git-Tag: emacs-24.3.90~173^2~7^2~392
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/d0cfb71f2e0a5a4cd231b3139f013a1908bfaefa

Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org
---

d0cfb71f2e0a5a4cd231b3139f013a1908bfaefa