Merge tag 'upstream/1.0'
authorDevon Kearns <dookie@kali.org>
Fri, 15 Feb 2013 17:52:37 +0000 (10:52 -0700)
committerDevon Kearns <dookie@kali.org>
Fri, 15 Feb 2013 17:52:37 +0000 (10:52 -0700)
Upstream version 1.0


Trivial merge