From: Mike O'Connor <stew@vireo.org>
Date: Fri, 30 Oct 2009 11:37:50 +0000 (+0100)
Subject: merge from flotow
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c167da7716976d943d9eece5aca235931b043cb4;p=dak

merge from flotow

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

c167da7716976d943d9eece5aca235931b043cb4