merged from donkult

diff --cc debian/changelog
index 1cdfbe61d5d80783dcbc6e1495f635224c4a9951,2819158376012d22aa9ac76eeb01e9063470bc8c..20dc9d188a2eb4d23733991b36983a99bbe24723
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,31 +1,41 @@@
 +apt (0.9.7) UNRELEASED; urgency=low
 +
 +  * apt-pkg/contrib/mmap.cc:
 +    - Fix the Fallback option to work correctly, by not calling
 +      realloc() on a map mapped by mmap(), and by using malloc
 +      and friends instead of new[].
 +    - Zero out the new memory allocated with realloc().
 +
 + -- Julian Andres Klode <jak@debian.org>  Sat, 16 Jun 2012 14:28:38 +0200
 +
+ apt (0.9.6.1) UNRELEASED; urgency=low
+ 
+   [ Daniel Hartwig ]
+   * apt-pkg/pkgcachegen.cc:
+     - always reset _error->StackCount in MakeStatusCache (Closes: #677175)
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/deb/deblistparser.cc:
+     - ensure that mixed positive/negative architecture wildcards
+       are handled in the same way as dpkg handles them
+     - use PackageArchitectureMatchesSpecification filter
+   * apt-pkg/cachefilter.cc:
+     - add PackageArchitectureMatchesSpecification (Closes: #672603)
+   * apt-pkg/cacheset.cc:
+     - add PackageContainerInterface::FromGroup to support
+       architecture specifications with wildcards on the commandline
+   * apt-pkg/pkgcache.cc:
+     - do a string comparision for architecture checking in IsMultiArchImplicit
+       as 'unique' strings in the pkgcache aren't unique (Closes: #677454)
+   * buildlib/configure.mak:
+     - print a message detailing how to get config.guess and config.sub
+       in case they are not in /usr/share/misc (Closes: #677312)
+   * cmdline/apt-get.cc:
+     - print a friendly message in 'download' if a package can't be
+       downloaded (Closes: #677887)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 14 Jun 2012 15:45:13 +0200
+ 
  apt (0.9.6) unstable; urgency=low
  
    [ David Kalnischkies ]