Merge branch 'policy'
authorSamuel Mimram <smimram@debian.org>
Fri, 16 Jun 2006 08:33:18 +0000 (08:33 +0000)
committerSamuel Mimram <smimram@debian.org>
Fri, 16 Jun 2006 08:33:18 +0000 (08:33 +0000)

Trivial merge