Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Mar 2010 17:06:43 +0000 (10:06 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Mar 2010 17:06:43 +0000 (10:06 -0700)

Trivial merge