From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 12 Dec 2010 14:52:37 +0000 (+0100)
Subject: Merge branch 'master' into security
X-Git-Tag: debian-r/squeeze~455^2^2~29
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e531ecdc04d1c9204ab001a3dac9eda2b6405338;p=dak.git

Merge branch 'master' into security

* master:
  fixme note
---

e531ecdc04d1c9204ab001a3dac9eda2b6405338