Merge branch 'doc-orig' into doc-debian
authorBdale Garbee <bdale@gag.com>
Tue, 4 Feb 2014 01:48:38 +0000 (18:48 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 4 Feb 2014 01:48:38 +0000 (18:48 -0700)

Trivial merge