From: Alan Mackenzie <acm@muc.de>
Date: Fri, 28 Oct 2011 14:37:05 +0000 (+0000)
Subject: Boring merge.
X-Git-Tag: emacs-pretest-24.0.91~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab;p=emacs.git

Boring merge.
---

1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab