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

Merge from trunk.
---

8462fc0ce20cc1caf883996d193d1cd2c1629498