From: Alan Mackenzie <acm@muc.de>
Date: Sun, 15 Jan 2012 19:34:11 +0000 (+0000)
Subject: Merge.
X-Git-Tag: emacs-pretest-24.0.93~97^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44b0225ed09cfbc6cee7ed53c630988c342df806;p=emacs.git

Merge.
---

44b0225ed09cfbc6cee7ed53c630988c342df806