Merge branch 'debian/sid' into debian/experimental

Conflicts:
	cmdline/apt-get.cc
	debian/changelog

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 494d819f4ec6849a661f1da9cdec9503e7cf8bef,3be808686742bcb7a8d55fcee8982acb1a9822c5..af75ee75767aa3ee49d8530e69ee9c06c93b830b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,34 +1,54 @@@
++<<<<<<< HEAD
 +apt (0.9.10~exp1) UNRELEASED; urgency=low
 +
 +  [ 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
 +  * 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)
 +  * [ABI-Break] lp:~mvo/apt/source-hashes:
 +    - use sha{512,256,1} for deb-src when available LP: #1098738
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 12:12:39 +0100
++=======
+ apt (0.9.11) UNRELEASED; urgency=low
+ 
+   The "Happy 20th Birthday Debian" upload
+   
+   [ Daniel Hartwig ]
+   * Clarify units of Acquire::http::Dl-Limit (closes: #705445)
+   * Show a error message if {,dist-}upgrade is used with additional
+     arguments (closes: #705510)
+ 
+   [ Michael Vogt ]
+   * lp:~mvo/apt/config-clear:
+     - support Configuration.Clear() for a clear of the entire 
+       configuration
+   * lp:~mvo/apt/add-glob-function:
+     -  add Glob() to fileutl.{cc,h}
+   * feature/apt-binary2
+     - refactor large chunks of cmdline/*.cc into a new libapt-private
+       library that is shared between the internal apt cmdline tools
+     - install libapt-private* into the apt binary
+     - add PACKAGE_MATCHER_ABI_COMPAT define so that this branch can be 
+       merged without breaking ABI
+ 
+   [ David Kalnischkies ]
+   * ensure that pkgTagFile isn't writing past Buffer length (Closes: 719629)
+   * allow Pre-Install-Pkgs hooks to get info over an FD != stdin
+     (Closes: #671728)
+ 
+   [ Christian PERRIER ]
+   * French translation update.
+ 
+  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 15 Aug 2013 09:27:35 +0200
++>>>>>>> debian/sid
  
  apt (0.9.10) unstable; urgency=low