merged from the lp:~mvo/apt/mvo branch

debian/changelog

@@ -10,7 +10,7 @@ apt (0.7.25ubuntu3) UNRELEASED; urgency=low
     - add new "Acquire::cdrom::AutoDetect" variable that enables/disables
       the dlopen of libudev for automatic cdrom detection
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 18 Dec 2009 16:54:18 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 26 Jan 2010 12:01:36 +0100
 
 apt (0.7.25ubuntu2) lucid; urgency=low
 

methods/cdrom.cc

@@ -92,7 +92,7 @@ string CDROMMethod::GetID(string Name)
 // CDROMMethod::AutoDetectAndMount                                      /*{{{*/
 // ---------------------------------------------------------------------
 /* Modifies class varaiable CDROM to the mountpoint */
-bool CDROMMethod::AutoDetectAndMount(URI Get, string NewID)
+bool CDROMMethod::AutoDetectAndMount(URI Get, string &NewID)
 {
    vector<struct CdromDevice> v = UdevCdroms.Scan();