* merged with bubulle

Patches applied:

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

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

 * bubulle@debian.org--2005/apt--main--0--patch-118
   Russian translation update by Yuri Kozlov

diff --cc debian/changelog
index 9716c3836d31aa4c70bbb42be2240d15f10d908b,6b858cdcde162ae4e96696bf3053965eb3e213f1..567dc803ec0661d0ba6c33844ba3decfd52a14bc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,3 +1,22 @@@
++apt (0.6.42.2) unstable; urgency=low
++
++  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118:
++    - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
++   
++ --
++
 +apt (0.6.42.1) unstable; urgency=low
 +
 +  * fix a incorrect example in the apt_prefrences man page
 +    (thanks to Filipus Klutiero, closes: #282918)
 +  * apt-pkg/pkgrecords.cc:
 +    - revert patch from last version, it causes trouble on alpha 
 +      and ia64 (closes: #335102, #335103)
 +  * cmdline/apt-get.cc:
 +    - be extra carefull in FindSrc (closes: #335213)
 +
 + -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200
 +
  apt (0.6.42) unstable; urgency=low
  
    * apt-pkg/cdrom.cc: