Merge branch 'master' into bug479080-rra
commit3c44af41c1e238584999755c7c4a801674a95a1a
authorRuss Allbery <rra@debian.org>
Sun, 3 Aug 2008 21:35:57 +0000 (3 14:35 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 3 Aug 2008 21:35:57 +0000 (3 14:35 -0700)
tree281879424831f1343dd13230e5675271e07976fa
parenta6cfe7a34a774353d75d42948ca971708f5d23e5
parent384440cf48def52710a14ad1c3bc6b9ec4a14f79
Merge branch 'master' into bug479080-rra
policy.sgml