Merge branch 'wheezy'

Conflicts:
	man/po4a/po/de.po

diff --cc debian/changelog
index 3f85493ad60cb0c16b602d44f49cda56df898583,bb2773a3058a43542dd222f521d19020761510de..2ff9bfa60e06fe5ae3db9d26c79310abf9880397
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,4 +1,23 @@@
-   * Updated German man page translation. Closes: #685538
-   * Updated French man page translation. Closes: #685560
-   * Updated Spanish man page translation. Closes: #686291
 +debhelper (9.20120609) UNRELEASED; urgency=low
 +
 +  * dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being
 +    used here rather than in dh_makeshlibs. Closes: #680339
 +  * dh_lintian: Source overrides doc improvement. Closes: #683941
- debhelper (9.20120909) UNRELEASED; urgency=low
 +  * dh_installmime: No longer makes maintainer scripts run update-mime and
 +    update-mime-database, that is now handled by triggers. Closes: #684689
 +    Thanks, Charles Plessy
 +  * python distutils buildsystem: Propigate failure of pyversions.
 +    Closes: #683551 Thanks, Clint Byrum
 +  * python distutils buildsystem: When checking if a version of python is
 +    installed, don't trust the presense of the executable, as
 +    a python2.X-minimal package may provide it while not having
 +    distutils installed. Closes: #683557
 +  * dh_icons: Improve documentation. Closes: #684895
 +  * Improve -X documentation. Closes: #686696
 +
 + -- Joey Hess <joeyh@debian.org>  Thu, 05 Jul 2012 08:51:07 -0600
 +
+ debhelper (9.20120909) unstable; urgency=low
  
    * autoscript() can now be passed a perl sub to run to s/// lines of
      the script, which avoids problems with using sed, including potentially