Merge branch 'master' into debian
authorSam Hartman <hartmans@painless-security.com>
Thu, 3 Oct 2013 19:49:43 +0000 (15:49 -0400)
committerSam Hartman <hartmans@painless-security.com>
Thu, 3 Oct 2013 19:49:43 +0000 (15:49 -0400)

Trivial merge