From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 16 Aug 2011 05:58:30 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~80
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f74064edab68e5620fade9b802e863cb110afd2;p=emacs.git

Merge from trunk.
---

3f74064edab68e5620fade9b802e863cb110afd2