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

Conflicts:

	man/ChangeLog

man/ChangeLog

@@ -2,6 +2,10 @@
 
 	* 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.