* merge lp:~mvo/apt/netrc branch, this adds support for a

  /etc/apt/auth.conf that can be used to store username/passwords
  in a "netrc" style file (with the extension that it supports "/"
  in a machine definition). Based on the maemo git branch.
* apt-pkg/deb/dpkgpm.cc:
  - add "purge" to list of known actions

diff --combined debian/changelog
index cf197728652faf69adcd8bd441c39e23969c2dd2,8c5cbac7c652724bc65a5c40f67b858d2fcae6af..9b3bd724c6764210b2eafe92b44a09736ffea9e3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -19,8 -19,6 +19,8 @@@ apt (0.7.25) UNRELEASED; urgency=lo
      Closes: #555797
    * Simplified Chinese translation update by Aron Xu 
      Closes: #558737
 +  * Slovak translation update by Ivan Masár
 +    Closes: #559277
    
    [ Michael Vogt ]
    * apt-pkg/packagemanager.cc:
@@@ -32,6 -30,12 +32,12 @@@
    * methods/https.cc:
      - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
        thanks to Brian Thomason for the patch
+   * merge lp:~mvo/apt/netrc branch, this adds support for a
+     /etc/apt/auth.conf that can be used to store username/passwords
+     in a "netrc" style file (with the extension that it supports "/"
+     in a machine definition). Based on the maemo git branch.
+   * apt-pkg/deb/dpkgpm.cc:
+     - add "purge" to list of known actions
  
    [ Brian Murray ]
    * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: