merged lp:~mvo/apt/hash-order

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc debian/changelog
index 36b5bd9d11a915b1e1fe62704af1c45287b5e7be,ef50ea4231569d3b5746fca0c01d78b9a2c4406b..792b120945e3d5e3fe0b048b49c5d25df6eeb724
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,3 +1,28 @@@
-  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 09 Jul 2012 17:36:40 +0200
 +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
 +    - print error in log if tcgetattr() fails instead of writing
 +      a empty file
++  * use sha512 when available (LP: #1098752)
 +
++ -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 12:12:39 +0100
 +
  apt (0.9.7.8) UNRELEASED; urgency=low
  
    [ Manpages translation updates ]