From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 11 Jun 2011 21:32:21 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~1271^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8eeb28635aafbbba375bc54cbccba2137d5a7aa2;p=emacs.git

Merge from trunk.
---

8eeb28635aafbbba375bc54cbccba2137d5a7aa2