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

Merge from trunk.
---

d231e1987e31c9481489ee90db89b7b055ab3fb9