Merge branch 'master' of ssh://git.gag.com/scm/git/gag.com
authorBdale Garbee <bdale@gag.com>
Fri, 5 Dec 2008 18:14:19 +0000 (11:14 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 5 Dec 2008 18:14:19 +0000 (11:14 -0700)

Trivial merge