Merge tag 'upstream/1.5.3'
authorMati Aharoni (Kali Linux Developer) <muts@kali.org>
Fri, 23 May 2014 10:14:52 +0000 (06:14 -0400)
committerMati Aharoni (Kali Linux Developer) <muts@kali.org>
Fri, 23 May 2014 10:14:52 +0000 (06:14 -0400)
Upstream version 1.5.3


Trivial merge