From: Mike O'Connor <stew@vireo.org>
Date: Wed, 4 Nov 2009 16:38:47 +0000 (-0500)
Subject: Merge remote branch 'flotow/contents' into contents
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5de5424527230b8fb9e742e9221fa3b966a86b5a;p=dak

Merge remote branch 'flotow/contents' into contents
---

5de5424527230b8fb9e742e9221fa3b966a86b5a