From: Russ Allbery <rra@debian.org>
Date: Wed, 18 Aug 2010 20:55:56 +0000 (-0700)
Subject: Merge branch 'master' into bug504880-rra
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=12c610edc8c87edeedd4ff393fcd6d441cfc0446;p=debian%2Fdebian-policy.git

Merge branch 'master' into bug504880-rra
---

12c610edc8c87edeedd4ff393fcd6d441cfc0446