Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 17:18:59 +0000 (13:18 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 17:18:59 +0000 (13:18 -0400)

Trivial merge