Merge remote-tracking branch 'origin/moonshot' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 18:55:44 +0000 (13:55 -0500)
committerSam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 18:55:44 +0000 (13:55 -0500)

Trivial merge