Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Tue, 13 Dec 2011 20:20:37 +0000 (15:20 -0500)
committerSam Hartman <hartmans@painless-security.com>
Tue, 13 Dec 2011 20:20:37 +0000 (15:20 -0500)

Trivial merge