Merge tag 'upstream/1.2.1'
authorDevon Kearns <dookie@kali.org>
Wed, 3 Jul 2013 16:28:20 +0000 (10:28 -0600)
committerDevon Kearns <dookie@kali.org>
Wed, 3 Jul 2013 16:28:20 +0000 (10:28 -0600)
Upstream version 1.2.1


Trivial merge