From: Alan Mackenzie <acm@muc.de>
Date: Wed, 18 Jan 2012 11:50:27 +0000 (+0000)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.93~97^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8afb1265f8067d360f03c514603223cde92ffeb;p=emacs.git

Merge from trunk.
---

e8afb1265f8067d360f03c514603223cde92ffeb