Merge branch 'debian/sid' into bugfix/update-progress-reporting

diff --combined apt-private/acqprogress.cc
index adec3740596a0175fda247934a5554da6442331b,0f5b53e500666ff7d48ec48085cfa7fdb9480de3..ee6c4536f1c3ffb964dcb3d3c8d9a9e8af5b6aa1
--- 1/apt-private/acqprogress.cc
--- 2/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@@ -170,7 -170,7 +170,7 @@@ bool AcqTextStatus::Pulse(pkgAcquire *O
        ScreenWidth = sizeof(Buffer)-1;
  
     // Put in the percent done
 -   sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
 +   sprintf(S,"%.0f%%", Percent);
  
     bool Shown = false;
     for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
@@@ -267,7 -267,7 +267,7 @@@
     else
        cout << '\r' << BlankLine << '\r' << Buffer << flush;
     if (_config->FindB("Apt::Color", false) == true)
-       cout << _config->Find("APT::Color::Neutral");
+       cout << _config->Find("APT::Color::Neutral") << flush;
  
     memset(BlankLine,' ',strlen(Buffer));
     BlankLine[strlen(Buffer)] = 0;