* merged from mainline

diff --cc debian/changelog
index 6d2a717,0347020..c9f4107
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -18,8 -13,17 +18,17 @@@ apt (0.6.44) unstable; urgency=lo
    * doc/apt-ftparchive.1.xml:
      - fix documentation for "SrcPackages" -> "Sources" 
        (thanks to Bart Martens for the patch, closes: #307756)
- 
-  -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 16:41:54 +0200
+   * debian/libapt-pkg-doc.doc-base.cache:
+     - remove broken charackter from description (closes: #361129)
+   * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: 
+     - i18n fixes (closes: #349298)
+   * debian/postinst: dont fail on not available
+     /usr/share/doc/apt/examples/sources.list (closes: #361130)
+   * methods/ftp.cc:
+     - unlink empty file in partial if the download failed because
+       the file is missing on the server (closes: #316337)
+   
 - --
++ -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 18:41:04 +0200
  
  apt (0.6.43.3) unstable; urgency=low