From: Russ Allbery <rra@debian.org>
Date: Thu, 3 Jun 2010 16:34:56 +0000 (-0700)
Subject: Merge branch 'master' into bug530687-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f0e479beebb289209628fe14241e7ffd1be6ec2e;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug530687-rra
---

f0e479beebb289209628fe14241e7ffd1be6ec2e