Merge tag 'upstream/0.10.6'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 14:17:54 +0000 (10:17 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Mon, 19 Aug 2013 14:17:54 +0000 (10:17 -0400)
Upstream version 0.10.6


Trivial merge