merged debian-sid

diff --cc debian/changelog
index 931fde577198402d470ddcd20886bb2a9b3f32d2,9483fbe5496218894a84e7ac8f4331f880375d14..ae50ad20c2e28c089f8b006eaa6cda93370716c6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,19 +1,42 @@@
+ apt (0.8.13) UNRELEASED; urgency=low
+ 
+   [ 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
+   * po/sl.po:
+     - updated, thanks to Andrej Znidarsic
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 14 Mar 2011 13:17:08 +0100
+ 
 +apt (0.8.12ubuntu2) unstable; urgency=low
 +
 +  [ 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
 +
 +apt (0.8.12ubuntu1) natty; urgency=low
 +
 +  * merged from debian/sid, this adds important fixes in the udev based
 +    cdrom handling and multiarch handling
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 16:12:22 +0100
 +
  apt (0.8.12) unstable; urgency=low
  
    [ Michael Vogt ]