merge with debian-experimental

diff --combined debian/changelog
index 73881ac54061859b74051a344251a53700ad95a0,478d6e1e242bf5a72c35d1c6414b328cff3559bb..9aeb2f8099a3235822ce5e72149b24f797531ea9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,19 @@@
- apt (0.8.16~exp3) experimental; urgency=low
+ apt (0.8.16~exp3) UNRELEASEDexperimental; urgency=low
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jun 2011 09:19:27 +0100
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcache.h:
 +    - readd All{Foreign,Allowed} as suggested by Julian to
 +      remain strictly API compatible
 +  * apt-pkg/acquire*.{cc,h}:
 +    - try even harder to support really big files in the fetcher by
 +      converting (hopefully) everything to 'long long' (Closes: #632271)
 +
++  [ Michael Vogt ]
+   * merge fixes from the debian/unstable upload
+   * merge lp:~mvo/apt/sha512-template to get fixes for the 
+     sha1/md5 verifiation (closes: #632520)
+ 
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 05 Jul 2011 15:56:42 +0200
  
  apt (0.8.16~exp2) experimental; urgency=low
  
@@@ -50,17 -46,6 +55,17 @@@ apt (0.8.16~exp1) experimental; urgency
  
   -- Michael Vogt <mvo@debian.org>  Wed, 29 Jun 2011 12:40:31 +0200
  
 +apt (0.8.15.2) unstable; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/pkgcachegen.cc:
 +    - fallback to memory if file is not writeable even if access()
 +      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
 +  * doc/sources.list.5.xml:
 +    - document available [options] for sources.list entries (Closes: 632441)
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 05 Jul 2011 15:12:21 +0200
 +
  apt (0.8.15.1) unstable; urgency=low
  
    [ David Kalnischkies ]