Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg into peterk-swedish-20070731

Conflicts:

	man/ChangeLog

diff --cc man/ChangeLog
index d787a56a917fa483ae6a3322ffc3e87657a0ecd8,ebc610e4cbdb668560e68eda51e8912dc08a4830..7084659db4da63f21c690933c3271b1124b6b2f2
--- 1/man/ChangeLog
--- 2/man/ChangeLog
+++ b/man/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2007-08-05  Peter Karlsson  <peterk@debian.org>
 +
 +      * po/sv.po: Updated to 1282t.
 +
+ 2007-08-05  Helge Kreutzmann  <debian@helgefjell.de>
+ 
+         * po/de.po: Updated to 1111t6f165u.
+ 
  2007-07-31  Peter Karlsson  <peterk@debian.org>
  
        * po/sv.po, po/sv.add: Updated to 991t291u.