From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Jun 2011 16:25:06 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~472^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f0b1513ad9b24e2f7dec87d3afb32cd6240ccad;p=emacs.git

Merge from trunk.
---

9f0b1513ad9b24e2f7dec87d3afb32cd6240ccad