merge with debian-sid

diff --cc debian/changelog
index 277c1d961c7a921baadaf009bd88ae8747a59a7f,36b6d34510bef30e69b6cfd3711353b5796e4256..8517f54d6cf26072190948246810a3fffc6f2278
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,16 -5,21 +5,24 @@@ apt (0.8.15.10) UNRELEASEDunstable; urg
      - show a debug why a package was kept by ResolveByKeep()
    * doc/manpage-style.xml:
      - put <brackets> around email addresses
 +  * apt-pkg/aptconfiguration.cc:
 +    - parse dpkg --print-foreign-architectures correctly in
 +      case archs are separated by newline instead of space, too.
+   * doc/po/de.po:
+     - apply typo-fix from Michael Basse, thanks! (LP: #900770)
  
    [ Chris Leick ]
    * German manpage translation update
    * doc/*.xml:
      - find and fix a bunch of misspellings
  
-  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 14 Dec 2011 12:32:37 +0100
+   [ Program translation updates ]
+   * Dutch (Jeroen Schot). Closes: #652230
+   * Slovak (Ivan Masar). Closes: #652985
+   * Russian (Yuri Kozlov). Closes: #654844
+   * Hungarian (Gabor Kelemen). Closes: #655238
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 06 Dec 2011 16:35:39 +0100
++ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 10 Jan 2012 13:38:58 +0100
  
  apt (0.8.15.9) unstable; urgency=low