From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 23 Oct 2011 16:21:23 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~6^2~144
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c7aa964fd2681c97664bc7df9e7e034b526a600;p=emacs.git

Merge from trunk.
---

9c7aa964fd2681c97664bc7df9e7e034b526a600