Merge branch 'master' into debian
authorSam Hartman <hartmans@painless-security.com>
Tue, 8 Oct 2013 13:08:59 +0000 (09:08 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 8 Oct 2013 13:08:59 +0000 (09:08 -0400)

Trivial merge