Merge branch 'master' into bug519941-rra
commit9233e9d80ae8ebaea58f65a6b992665948d91274
authorRuss Allbery <rra@debian.org>
Fri, 7 Aug 2009 20:40:18 +0000 (7 13:40 -0700)
committerRuss Allbery <rra@debian.org>
Fri, 7 Aug 2009 20:40:18 +0000 (7 13:40 -0700)
tree7eb175839149cc283d2c018f372ecd68af1833d4
parenta6324250cd29846505af863774e819ed2e17f0e7
parent3c12ccafb5b8b42035ee670f2e0f5d3fa1277147
Merge branch 'master' into bug519941-rra
policy.sgml