Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 21 Sep 2009 18:00:22 +0000 (11:00 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 21 Sep 2009 18:00:22 +0000 (11:00 -0700)

Trivial merge