Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 2 Nov 2010 00:09:49 +0000 (18:09 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 2 Nov 2010 00:09:49 +0000 (18:09 -0600)

Trivial merge