From: Mike O'Connor <stew@vireo.org>
Date: Mon, 13 Apr 2009 20:09:23 +0000 (-0400)
Subject: merge with master
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1457bde3318c6605b4c97d4299803fdaf8e774;p=dak

merge with master
---

1e1457bde3318c6605b4c97d4299803fdaf8e774