From: Manoj Srivastava <srivasta@debian.org>
Date: Mon, 7 Sep 2009 20:31:00 +0000 (-0500)
Subject: Merge branch 'master' into srivasta
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10f927594e0ddeffc217e675cbd16f380be2da4f;hp=1e2daad3eec0f5d6b9d0f40293f76b2714a9c024;p=debian%2Fdebian-policy.git

Merge branch 'master' into srivasta
---