From: Mike O'Connor <stew@dhcp-101.dfw1.kickstart.lan>
Date: Sat, 31 Oct 2009 09:52:22 +0000 (+0000)
Subject: merge from master
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1fd15629858d8b3437cb7626f853e74c461ec1;p=dak

merge from master
---

7e1fd15629858d8b3437cb7626f853e74c461ec1