Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index 530691bee51e1351378333f42e80fb206c686638,942ee5fe71df05c8598fbe3ccdb295114a8c1f25..fcc12497c0749bf6cca5baddc8b15a4a5c2d4299
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,22 @@@
+ libguestfs (1:1.34.6-4) unstable; urgency=medium
+ 
+   * Fix i386 kernel build dependency (Closes: #869504)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 24 Jul 2017 01:13:17 +0200
+ 
+ libguestfs (1:1.34.6-3) unstable; urgency=medium
+ 
+   * Fix systemd/sysvinit dependency (Closes: #865398)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 20 Jul 2017 23:39:36 +0200
+ 
 +libguestfs (1:1.34.6-2+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 1:1.32.6-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 16 Aug 2016 01:41:53 +0000]
 +  * Change kernel build-dep for raspbian.
 +
 + -- Raspbian forward porter <root@raspbian.org>  Thu, 27 Apr 2017 13:36:48 +0000
 +
  libguestfs (1:1.34.6-2) unstable; urgency=medium
  
    * Re-enable building on mips. Thanks to Aurelien Jarno for pointing out

diff --cc debian/control
Simple merge