merged from lp:~donkult/apt/sid/

diff --combined debian/changelog
index 4fb8b89bc62a82cef4725d6da1d42f8c9f9e2e4e,7468c872c89fc51522385956da3d61b42e5dffd9..02462b724bde733be067c664109d1e86a9675a4d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,19 +1,22 @@@
 -apt (0.8.15.10) unstable; urgency=low
 +apt (0.8.15.10) UNRELEASEDunstable; urgency=low
  
    [ David Kalnischkies ]
    * algorithms.cc:
      - show a debug why a package was kept by ResolveByKeep()
    * doc/manpage-style.xml:
      - put <brackets> around email addresses
+   * 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>  Sun, 20 Nov 2011 18:02:08 +0100
 +  [ Program translation updatex ]
 +  * Dutch (Jeroen Schot). Closes: #652230
 +
+  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 06 Dec 2011 16:35:39 +0100
  
  apt (0.8.15.9) unstable; urgency=low