merge with debian-sid 0.8.15.1

debian/changelog

@@ -19,7 +19,7 @@ apt (0.8.15.1) unstable; urgency=low
     - save all stanzas which had no effect in Unmatched
     - allow package:architecure in Package:
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 30 Jun 2011 00:02:15 +0200
+ -- Michael Vogt <mvo@debian.org>  Thu, 30 Jun 2011 10:05:36 +0200
 
 apt (0.8.15) unstable; urgency=low