Merge branch 'dfsg-orig'
authorBdale Garbee <bdale@gag.com>
Tue, 18 May 2010 21:08:33 +0000 (15:08 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 18 May 2010 21:08:33 +0000 (15:08 -0600)

Trivial merge