Merge branch 'debian/sid' into bugfix/bts731738-fancy-progess

Conflicts:
	apt-pkg/install-progress.cc

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

diff --cc apt-pkg/install-progress.cc
index 0e093a5117cbf358fbe77d638661f8f2aac9ca38,0caf62b6101ae94ea2dea4484f21753ecff140fa..fe065da4ff328bca61d6b439bddcaeb77207a7bd
--- 1/apt-pkg/install-progress.cc
--- 2/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@@ -9,7 -9,7 +9,8 @@@
  #include <sys/ioctl.h>
  #include <sstream>
  #include <fcntl.h>
 +#include <algorithm>
+ #include <stdio.h>
  
  namespace APT {
  namespace Progress {