* star-merged with apt--mvo

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-133
   Merge with Michael AND update PO files

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102
   * finalized this release

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103
   * changelog updates

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104
   * build-depend on libdb4.3 now, fix for kFreeBSD (#317718)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105
   * fix mailaddress

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106
   * fix a string (thanks to bubulle)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107
   * merged with bubulle

diff --cc debian/changelog
index d57825909cb95a6e69003fe477326d9b802261b8,86ca0135df25e458c863895e2c0cfefe055325f6..2061f81258429dc8736683e690660c0c75097673
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,11 +1,17 @@@
 -apt (0.6.43.1) unstable; urgency=low
 +apt (0.6.43ubuntu2) dapper; urgency=low
  
 -  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-133:
 -    * fr.po: Completed to 510 strings
 +  * merged some missing bits that where dropped by the previous
 +    merge (*cough*)
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Nov 2005 10:14:02 +0100
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  8 Dec 2005 18:35:58 +0100
 +
 +apt (0.6.43ubuntu1) dapper; urgency=low
 +
 +  * merged with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:36:29 +0100
  
- apt (0.6.43) unstable; urgency=low
+ apt (0.6.43) unstable; urgency=medium
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
      * zh_CN.po: Completed to 510 strings(Closes: #338267)
@@@ -25,24 -19,11 +25,31 @@@
    * support a download rate limit for http (closes: #146877)
    * included lots of the speedup changes from #319377
    * add stdint.h to contrib/md5.h (closes: #340448)
+   * ABI change, library name changed (closes: #339147)
+   * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
+   * switch to libdb4.3 in build-depends
    
++<<<<<<< TREE
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:22:31 +0100
 +
 +apt (0.6.42.3ubuntu2) dapper; urgency=low
 +
 +  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:  
 +    * zh_CN.po: Completed to 507 strings(Closes: #338267)
 +    * gl.po: Completed to 510 strings (Closes: #338356)
 +  * added support for "/etc/apt/sources.list.d" directory 
 +    (closes: #66325)
 +  
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Nov 2005 15:30:12 +0100
 +
 +apt (0.6.42.3ubuntu1) dapper; urgency=low
 +
 +  * synced with debian
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2005 05:05:56 +0100
++=======
+  -- Michael Vogt <mvo@debian.org>  Tue, 29 Nov 2005 00:17:07 +0100
++>>>>>>> MERGE-SOURCE
  
  apt (0.6.42.3) unstable; urgency=low