From: James Troup <james@nocrew.org>
Date: Mon, 12 Jun 2006 00:50:08 +0000 (+0100)
Subject: Merge changes from spohr.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52b59f8361ab561f95e9b6ce39063239bbb3eaca;p=dak

Merge changes from spohr.
---

52b59f8361ab561f95e9b6ce39063239bbb3eaca