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

Merge from trunk.
---

3c3a05dfb70656c56f60666a8c32a28d85f072fb