From: Michael Casadevall <sonicmctails@gmail.com>
Date: Tue, 23 Dec 2008 19:42:50 +0000 (-0500)
Subject: Merge commit 'dak-master/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c211e2e4799dc4693597e605ae0184b242bf2c9e;p=dak

Merge commit 'dak-master/master'
---

c211e2e4799dc4693597e605ae0184b242bf2c9e