Merge remote branch 'origin/moonshot' into debian
authorSam Hartman <hartmans@debian.org>
Sat, 30 Oct 2010 12:05:14 +0000 (08:05 -0400)
committerSam Hartman <hartmans@debian.org>
Sat, 30 Oct 2010 12:05:14 +0000 (08:05 -0400)

Trivial merge