From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Apr 2012 06:40:21 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~354
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5927b310c82f61ab3483fab0407032d2a57b56a3;p=emacs.git

Merge from trunk.
---

5927b310c82f61ab3483fab0407032d2a57b56a3