* merged with bubulle

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-105
   Proofread by Fred Bothamy

 * bubulle@debian.org--2005/apt--main--0--patch-106
   Merge with mvo

 * bubulle@debian.org--2005/apt--main--0--patch-107
   Italian translation corrected

 * bubulle@debian.org--2005/apt--main--0--patch-108
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-109
   Italian translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-110
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-111
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-112
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-113
   Silly update to French translation (testing)

 * bubulle@debian.org--2005/apt--main--0--patch-114
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-115
   Basque translation completed

diff --combined debian/changelog
index 1f504f2c52acb22273aff2e7d55f1bbd74010e9b,1f504f2c52acb22273aff2e7d55f1bbd74010e9b..28152fa0a62de461c76bbb3999824c4bae0f2f88
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,10 -5,10 +5,13 @@@ apt (0.6.41.1) unstable; urgency=lo
    * allow cdrom failures and fallback to other sources in that case
      (closes: #44135)
    * better error text when dpkg-source fails 
--  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104:
++  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
      - patch-99: Added Galician translation
      - patch-100: Completed Danish translation (Closes: #325686)
      - patch-104: French translation completed
++    - patch-109: Italian translation completed
++    - patch-112: Swedish translation update
++    - patch-115: Basque translation completed
    * applied french man-page update (thanks to Philippe Batailler)
      (closes: #316318, #327456)
    * fix leak in the mmap code, thanks to Daniel Burrows for the