From: Bill Wohler <wohler@newt.com>
Date: Sun, 25 Nov 2012 18:33:16 +0000 (-0800)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a09777fb290dfd273a66a845e75b208f23262f06;p=emacs.git

Merge from trunk.
---

a09777fb290dfd273a66a845e75b208f23262f06