From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Jun 2011 18:58:22 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~548^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8f2a944716884ba72b9ef3a49db2d5bca428ac9;p=emacs.git

Merge from trunk.
---

e8f2a944716884ba72b9ef3a49db2d5bca428ac9