Merge branch 'master' into bug475101-rra
commit04677e5a64cd5d615d351af3714ecdb21f9c2ef5
authorRuss Allbery <rra@debian.org>
Wed, 7 Jul 2010 15:48:14 +0000 (7 08:48 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 7 Jul 2010 15:48:14 +0000 (7 08:48 -0700)
treed8ea7b0087d44a0abbf893491b716dd2fae5fb9f
parentced53079bb44bb9ff553836cd0d2f76ab3084241
parentf441d8d07c035bc7d131fe0825b53086085ff8d0
Merge branch 'master' into bug475101-rra
policy.sgml