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

Trivial merge