* 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 --cc apt-pkg/deb/dpkgpm.cc
Simple merge

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

diff --cc apt-pkg/makefile
Simple merge

diff --cc debian/changelog
Simple merge

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

diff --cc methods/http.cc
Simple merge

diff --cc methods/https.cc
Simple merge