merged from the lp:~mvo/apt/libudev-dlopen branch

diff --cc apt-pkg/init.cc
Simple merge

diff --cc debian/apt.dirs
index d11ee0f2f67953a6517e443e8659e003bf321abc,b812f116b504af96f2bfcd9d96f3e14a105cc785..1377c8066edcb448388f6ac99ded7044c54f1012
--- 1/debian/apt.dirs
--- 2/debian/apt.dirs
+++ b/debian/apt.dirs
@@@ -8,8 -8,8 +8,9 @@@ etc/apt/sources.list.
  etc/logrotate.d
  var/cache/apt/archives/partial
  var/lib/apt/lists/partial
 +var/lib/apt/mirrors/partial
  var/lib/apt/periodic
+ var/lib/apt/media
  var/log/apt
  usr/share/bug/apt
  usr/share/lintian/overrides

diff --cc debian/changelog
index dccdda64f5a55cb4d4d4d9811521e209ac897bee,7e38cda9985964fddf1c77399ff743fdcde92009..21c71e4d6db4b5e79239e6b4edc609c0948b55aa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -9,23 -12,8 +9,25 @@@ apt (0.7.25ubuntu3) UNRELEASED; urgency
      - fixes in multi cdrom setup code
      - add new "Acquire::cdrom::AutoDetect" variable that enables/disables
        the dlopen of libudev for automatic cdrom detection
++  * cmdline/apt-cdrom.cc:
++    - add new --auto-detect option
  
 - -- 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
 +
 +  * Change history branch so that it does not break the 
 +    apt ABI for the pkgPackageManager interface
 +    (can be reverted on the next ABI break)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Dec 2009 10:14:16 +0100
 +
 +apt (0.7.25ubuntu1) lucid; urgency=low
 +
 +  * Merged from the mvo branch
 +  * merged from the lp:~mvo/apt/history branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Dec 2009 09:44:08 +0100
  
  apt (0.7.25) unstable; urgency=low
  

diff --cc doc/examples/configure-index
Simple merge