From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 8 Oct 2011 06:17:40 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~159
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f7dfe84eeacb0316d2ceb8ed5fa59d50c4a7bdc8;p=emacs.git

Merge from trunk.
---

f7dfe84eeacb0316d2ceb8ed5fa59d50c4a7bdc8