From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 6 Jan 2010 16:04:19 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5609
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea2b370da2766fed12db4e7c0f33ddce12f9d0b4;p=emacs.git

Merge from trunk
---

ea2b370da2766fed12db4e7c0f33ddce12f9d0b4