Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 16:31:29 +0000 (10:31 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 16:31:29 +0000 (10:31 -0600)

Trivial merge