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

Merge from trunk.
---

7ab3acf4ad7166a3ae8998a8a43ad59f852879ea