Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 12 Oct 2009 21:57:08 +0000 (15:57 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 12 Oct 2009 21:57:08 +0000 (15:57 -0600)

Trivial merge