From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 17 Jul 2011 01:34:49 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~144
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d576a545d08182fae5c7d705a53da2a84e0d85a;p=emacs.git

Merge from trunk.
---

8d576a545d08182fae5c7d705a53da2a84e0d85a