merged latest upload

diff --combined debian/changelog
index 74eb09add153d37a6a61c922bec6ea1dcafb7a52,74eb09add153d37a6a61c922bec6ea1dcafb7a52..ec03e5a5179753685bb70c1a74e4f9e7b7af64ab
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,10 @@@
++apt (0.9.6ubuntu2) quantal; urgency=low
++
++  * adjust apt-key to ensure no collisions on subkeys too. Patch thanks to
++    Marc Deslauriers. (LP: #1013128)
++
++ -- Jamie Strandboge <jamie@ubuntu.com> Thu, 14 Jun 2012 11:29:48 -0500
++
  apt (0.9.6ubuntu1) quantal; urgency=low
  
    [ Michael Vogt ]