From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 May 2011 05:35:30 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~239^2~15
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2d818bf00fa3a3204abd9b31103cfca21ff8125;p=emacs.git

Merge from mainline.
---

d2d818bf00fa3a3204abd9b31103cfca21ff8125