Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Fri, 10 Sep 2010 02:05:27 +0000 (20:05 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 10 Sep 2010 02:05:27 +0000 (20:05 -0600)

Trivial merge