Merge in changes committed by rra to the main repo.

Merge in changes committed by rra to the main repo.

Merge in changes committed by rra to the main repo.

Patches applied:

 * debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--patch-1
   merge rra@debian.org--lenny/debian-policy--devel--3.7

 * rra@debian.org--lenny/debian-policy--devel--3.7--base-0
   tag of debian-policy@lists.debian.org--lenny/debian-policy--devel--3.7--base-0

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-1
   Document ~ behavior in version numbers

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-2
   Add test -a/-o and local to shell policy, update wording

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-3
   Substantial updates to the menu structure

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-4
   Typo fix for writability of maintainer scripts

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-5
   Recommend ${binary:Version} instead of ${Source-Version}

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-6
   Remove stray [fillme] from menu policy

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-7
   Formatting and alphabetization of the virtual package list

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-8
   Add new virtual package dictd-dictionary

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-9
   Rename inetd-superserver to inet-superserver

 * rra@debian.org--lenny/debian-policy--devel--3.7--patch-10
   Fix a/an misuse and other minor wording issues

git-archimport-id: srivasta@debian.org--lenny/debian-policy--devel--3.7--patch-2