Merge branch 'master' into bug402721-rra
commit105886046a19ef8dc906c3a2e563d8823fbbb967
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)
tree742f848d909658ab089c4e10863945796244aebb
parentf00d60803439e95784488d7fa5be9ede9ca0c2e2
parentf441d8d07c035bc7d131fe0825b53086085ff8d0
Merge branch 'master' into bug402721-rra
policy.sgml