Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sun, 6 Sep 2009 23:34:08 +0000 (17:34 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 6 Sep 2009 23:34:08 +0000 (17:34 -0600)

Trivial merge