cherry pick cdrom mount fixes from lp:~mvo/apt/mvo

diff --combined debian/changelog
index 6b88f84bf065e4541d974eca7f3c28315f6608e3,6b88f84bf065e4541d974eca7f3c28315f6608e3..f294525030ee9ab6283d8cff4dc16f6d767e0e14
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,9 @@@
++apt (0.8.11.5ubuntu3) UNRELEASED; urgency=low
++
++  * cherry pick cdrom mount fixes from lp:~mvo/apt/mvo
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 09 Mar 2011 12:16:32 +0100
++
  apt (0.8.11.5ubuntu2) natty; urgency=low
  
    [ Michael Vogt ]