merged from the debian-sid branch

diff --combined debian/changelog
index bc1a70d6f21f6df3fe3f8b8df532751447a74e7d,dcc6e4d169ad4e90153ab624133f603b92a2c7de..3213a62c4b9a78f9f707de569815b8b53ecb203a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,11 +1,33 @@@
 +apt (0.9.8~exp1) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - support \n and \r\n line endings in ReadMessages
 +
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - fix invalid InRelease file download checking and add regression
 +      test to server broken files to the buildin test webserver
 +  * stop exporting the accidently exported parsenetrc() symbol
 +  * lp:~mvo/apt/add-glob-function:
 +    -  add Glob() to fileutl.{cc,h}
 +  * lp:~mvo/apt/config-clear:
 +    - support Configuration.Clear() for a clear of the entire 
 +      configuration
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use tcgetattr() on STDOUT instead of STDIN so that term.log
 +      works for redirected stdin
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
 +
  apt (0.9.7.8) UNRELEASED; urgency=low
  
    [ Manpages translation updates ]
    * Italian (Beatrice Torracca). Closes: #696601
+   
+   [ Michael Vogt ]
+   * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
+     Closes: #697577
  
   -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100