From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 24 Jul 2011 22:16:20 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-pretest-24.0.90~104^2~164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ccd80c5525ba298b055e43f83830e9090b9b1887;p=emacs.git

Merge from trunk.
---

ccd80c5525ba298b055e43f83830e9090b9b1887