Merge tag 'upstream/0.3.7'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Sun, 24 Mar 2013 10:32:49 +0000 (06:32 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Sun, 24 Mar 2013 10:32:49 +0000 (06:32 -0400)
Upstream version 0.3.7


Trivial merge