Merge branch 'master' into bug504880-rra
commit648e73dfafd5bcd0705df698a454d54be5ca0b62
authorRuss Allbery <rra@debian.org>
Sun, 18 Jul 2010 01:13:26 +0000 (17 18:13 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 18 Jul 2010 01:13:26 +0000 (17 18:13 -0700)
treea05490f91f914e44053c85a19e0f0f744fb8cb12
parentb6c03d46c848248f1d1010cf74e5d1e44d6556eb
parentf98c99a1a2f6be481c04f38598880468afc1cf13
Merge branch 'master' into bug504880-rra
policy.sgml