Merge branch 'dfsg-orig' into dfsg-debian
authorBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 20:36:56 +0000 (14:36 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 20:36:56 +0000 (14:36 -0600)

Trivial merge