Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Conflicts:
	apt-private/private-cmndline.cc

diff --cc apt-private/private-cmndline.cc
index f4348c9794267222aafd63407995c3efdf9efc3f,35d61f318ed2f0c3405b66de6cdfcb1b62532f78..28309af07304c515250d26ef32902023b5ab73f3
--- 1/apt-private/private-cmndline.cc
--- 2/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@@ -226,8 -222,7 +226,8 @@@ bool addArgumentsAPT(std::vector<Comman
     {
        addArg(0,"installed","APT::Cmd::Installed",0);
        addArg(0,"upgradable","APT::Cmd::Upgradable",0);
-       addArg('a', "all-versions", "APT::Cmd::AllVersions", 0);
 +      addArg('v', "verbose", "APT::Cmd::List-Include-Summary", 0);
+       addArg('a', "all-versions", "APT::Cmd::All-Versions", 0);
     }
     else if (addArgumentsAPTGet(Args, Cmd) || addArgumentsAPTCache(Args, Cmd))
     {

diff --cc apt-private/private-list.cc
Simple merge