From: Mike O'Connor <stew@vireo.org>
Date: Fri, 30 Oct 2009 11:29:17 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into knownchanges
X-Git-Tag: debian-r/squeeze~937^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=42ca3d8171b5e775d7424e1a3d037db935ee387a;p=dak.git

Merge remote branch 'origin/master' into knownchanges
---

42ca3d8171b5e775d7424e1a3d037db935ee387a