Merge tag 'upstream/0.4.3'
authorEmanuele Acri (Kali Developer) <crossbower@kali.org>
Mon, 23 Sep 2013 12:29:14 +0000 (14:29 +0200)
committerEmanuele Acri (Kali Developer) <crossbower@kali.org>
Mon, 23 Sep 2013 12:29:14 +0000 (14:29 +0200)
Upstream version 0.4.3


Trivial merge