From: Bill Wohler <wohler@newt.com>
Date: Sun, 25 Nov 2012 21:45:59 +0000 (-0800)
Subject: Merge from trunk; up to 2012-11-25T20:14:53Z!wohler@newt.com.
X-Git-Tag: emacs-24.3.90~173^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3751dce51ef423d722298cf5494d27d40bced05;p=emacs.git

Merge from trunk; up to 2012-11-25T20:14:53Z!wohler@newt.com.
---

e3751dce51ef423d722298cf5494d27d40bced05