Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sat, 13 Nov 2010 00:32:43 +0000 (17:32 -0700)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Nov 2010 00:32:43 +0000 (17:32 -0700)

Trivial merge