Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 15:56:27 +0000 (09:56 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 15 Oct 2013 15:56:27 +0000 (09:56 -0600)

Trivial merge