Merge tag 'upstream/2.1.1'
authorDevon Kearns <dookie@kali.org>
Fri, 14 Mar 2014 16:58:58 +0000 (10:58 -0600)
committerDevon Kearns <dookie@kali.org>
Fri, 14 Mar 2014 16:58:58 +0000 (10:58 -0600)
Upstream version 2.1.1


Trivial merge