From: Alan Mackenzie <acm@muc.de>
Date: Fri, 28 Oct 2011 15:18:00 +0000 (+0000)
Subject: Merge.
X-Git-Tag: emacs-pretest-24.0.91~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e376ea4f737a9230a9767a12bdcc530da4b4da87;p=emacs.git

Merge.
---

e376ea4f737a9230a9767a12bdcc530da4b4da87