Merge branch 'dfsg-orig'
authorBdale Garbee <bdale@gag.com>
Sun, 1 Nov 2009 20:48:00 +0000 (13:48 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 1 Nov 2009 20:48:00 +0000 (13:48 -0700)

Trivial merge