Merge branch 'master' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 9 May 2011 16:18:20 +0000 (12:18 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 9 May 2011 16:18:20 +0000 (12:18 -0400)

Trivial merge