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

Conflicts:
	test/integration/test-apt-get-download

diff --cc test/integration/test-apt-get-download
index ec809e0ce84b9fcaa6caeec0092d187b4a3d7536,0d92283f1450f1b7d8c1c9755109d1e1aff7cbe6..7cce6ef2906d36d5d334cede9f81606e2af09c5e
--- 1/test/integration/test-apt-get-download
--- 2/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@@ -34,13 -34,13 +34,18 @@@ testequal "'file://${DEBFILE}' apt_2.0_
  # deb:677887
  testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms
  
 -# deb:736962 - apt-get download foo && 
 -aptget download apt
 -aptget download apt
 +# deb:736962
 +testsuccess aptget download apt
 +testsuccess aptget download apt
 +testsuccess test -s apt_2.0_all.deb
 +
 +rm -f apt_1.0_all.deb apt_2.0_all.deb
 +
 +# deb:738103
 +testsuccess aptget download apt apt apt/unstable apt=2.0
  testsuccess test -s apt_2.0_all.deb
 -rm -f apt_1.0_all.deb
+ 
+ # deb:738103 - apt-get download foo foo fails
+ rm -f apt_*.deb
+ aptget download apt apt
+ testsuccess test -s apt_2.0_all.deb