From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 30 Aug 2011 06:19:35 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~153^2~1^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f00b626d886d32b08aa6fb47e1cee124c1926897;p=emacs.git

Merge from trunk.
---

f00b626d886d32b08aa6fb47e1cee124c1926897