Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Thu, 11 Nov 2010 04:07:58 +0000 (21:07 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 11 Nov 2010 04:07:58 +0000 (21:07 -0700)

Trivial merge