merged from the mvo branch and add proper changelog

diff --cc debian/changelog
index 244bb83e01d3466d0b2b99b1f93ad42d90fdf1c4,244bb83e01d3466d0b2b99b1f93ad42d90fdf1c4..9a069215c04e109d48bd3267ad3e70d4ceb05312
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,13 @@@
++apt (0.8.15.3) UNRELEASED; urgency=low
++
++  * apt-pkg/acquire-item.cc:
++    - improve error message for a expired Release file
++  * apt-pkg/algorithms.cc:
++    - Hold back packages that would enter "policy-broken" state on upgrade
++      when doing a "apt-get upgrade"
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jul 2011 11:22:54 +0200
++
  apt (0.8.15.2) unstable; urgency=high
  
    * fix from David Kalnischkies for the InRelease gpg verification