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

diff --cc debian/changelog
index 13fd447,7e38cda..dccdda6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -10,22 -13,7 +10,22 @@@ apt (0.7.25ubuntu3) UNRELEASED; urgency
      - 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
 +
 +  * 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