Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Mon, 10 Oct 2011 15:02:32 +0000 (11:02 -0400)
committerSam Hartman <hartmans@painless-security.com>
Mon, 10 Oct 2011 15:02:32 +0000 (11:02 -0400)

Trivial merge