Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 21:13:28 +0000 (15:13 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 21:13:28 +0000 (15:13 -0600)

Trivial merge