Merge branch 'master' into bug504880-rra

Conflicts:
	policy.sgml

diff --cc policy.sgml
index 774c8225313222a6420ae457c5a07f2667053583,aa7f11bbc24020b1f1009ab6e121fe40680e03b8..ec605c60662682d4ae3e690d40e8a8841b7d0ce9
--- 1/policy.sgml
--- 2/policy.sgml
+++ b/policy.sgml
@@@ -4895,6 -4767,20 +4895,13 @@@ Build-Depends: foo [linux-any], bar [an
                installation would hamper the ability of the system to
                continue with any upgrade that might be in progress.
              </p>
 -            <p>
 -              <tt>Pre-Depends</tt> are also required if the
 -              <prgn>preinst</prgn> script depends on the named
 -              package.  It is best to avoid this situation if
 -              possible.
 -            </p>
 -
+ 
 -              doing that has been reached.
 -              See <ref id="dependencies">.
+             <p>
+               You should not specify a <tt>Pre-Depends</tt> entry for a
+               package before this has been discussed on the
+               <tt>debian-devel</tt> mailing list and a consensus about
++              doing that has been reached.  See <ref id="dependencies">.
++            </p>
            </item>
          </taglist>
        </p>