Merge remote-tracking branch 'origin/moonshot' into HEAD
authorSam Hartman <hartmans@painless-security.com>
Wed, 14 Dec 2011 10:14:49 +0000 (05:14 -0500)
committerSam Hartman <hartmans@painless-security.com>
Wed, 14 Dec 2011 10:14:49 +0000 (05:14 -0500)

Trivial merge