merged from the mvo branch

diff --cc debian/changelog
index 9747ddeb5122ffab49b26155d98e00b0e0537960,6176aa87eaf1ebd06600e68931624a5d812c0686..931fde577198402d470ddcd20886bb2a9b3f32d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,16 @@@
- apt (0.8.12ubuntu1) UNRELEASED; urgency=low
 -apt (0.8.13) unstable; urgency=low
++apt (0.8.12ubuntu2) unstable; urgency=low
  
 -  * debian/zzapt.cron.daily:
 -    - move cron job to the end of execution (LP: #727685)
+   [ Thorsten Spindler ]
+   * methods/rsh.cc
+     - fix rsh/ssh option parsing (LP: #678080), thanks to
+       Ville Mattila 
+   
    [ Michael Vogt ]
    * apt-pkg/acquire-item.cc:
      - mark pkgAcqIndexTrans as Index-File to avoid asking the
        user to insert the CD on each apt-get update
++  * methods/mirror.cc:
++    - improve debug output and fix bug in TryNextMirror
  
   -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100