From: Alan Mackenzie <acm@muc.de>
Date: Thu, 3 Nov 2011 22:03:18 +0000 (+0000)
Subject: Merge.
X-Git-Tag: emacs-pretest-24.0.92~221^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b;p=emacs.git

Merge.
---

85ba4cded3ef5a834c880edfdb6cf7ec3a747e9b