Merge branch 'master' of git+ssh://kreutzm-guest@git.debian.org/git/dpkg/dpkg

Conflicts:

	man/ChangeLog

diff --cc man/ChangeLog
index ff941b32a6cc70c9910b7bf50121e4e90d804415,fcc2e1a0517ce7075ce68f3041e156c8798d0eb7..36f60d7405c2764656abc1cfc78c05ec8e1377b0
--- 1/man/ChangeLog
--- 2/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,7 -1,13 +1,17 @@@
 +2007-10-07  Helge Kreutzmann  <debian@helgefjell.de>
 +
 +      * po/de.po: Updated to 1238t0f52u.
 +
+ 2007-09-30  Frank Lichtenheld  <djpig@debian.org>
+ 
+       * deb-control.5: Remove obsolete sentence regarding
+       the role of the Priority and Section field. They
+       have nothing to do with the archive layout since
+       woody.
+ 
+       * dpkg-source.1: Remove superfluous [options] from
+       -b command description.
+ 
  2007-09-28  Peter Karlsson  <peter@softwolves.pp.se>
  
        * po/sv.po: Updated to 1290t.

diff --cc man/po/de.po
index 7785bc57cb023267ccafcdee599b5a1cf6c3ee64,1d50004d3523096159f831530ff53dfa8a0aa7ac..7785bc57cb023267ccafcdee599b5a1cf6c3ee64
mode 100755,100644..100644
--- 1/man/po/de.po
--- 2/man/po/de.po
+++ b/man/po/de.po