Merge remote branch 'origin/master' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 13 Jun 2011 11:58:43 +0000 (07:58 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 13 Jun 2011 11:58:43 +0000 (07:58 -0400)

Trivial merge