Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 27 Apr 2010 06:17:37 +0000 (00:17 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 27 Apr 2010 06:17:37 +0000 (00:17 -0600)

Trivial merge