Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Wed, 19 Aug 2009 00:56:09 +0000 (18:56 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 19 Aug 2009 00:56:09 +0000 (18:56 -0600)

Trivial merge