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

Boring merge from savannah.
---

93b5b3bdc8b734132c530acd6ffae1196c0865bc