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

Trivial merge