* merged with mainline (doc fix)

diff --cc debian/changelog
index 65dc1e862453323b98c08abe59afde7442a1123e,00b46eb22b7023fa1ab2676ed794ae22f0c75d53..6d2a7173aed240fc336b95039b373dc6762373e7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -15,8 -10,11 +15,11 @@@ apt (0.6.44) unstable; urgency=lo
        patch) Closes: #350025
    * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
        * bg.po: Added, complete to 512t. Closes: #360262
+   * doc/apt-ftparchive.1.xml:
+     - fix documentation for "SrcPackages" -> "Sources" 
+       (thanks to Bart Martens for the patch, closes: #307756)
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 25 Apr 2006 09:34:20 +0200
 + -- Michael Vogt <mvo@debian.org>  Sun,  2 Apr 2006 16:41:54 +0200
  
  apt (0.6.43.3) unstable; urgency=low