Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 11 Sep 2012 16:35:04 +0000 (10:35 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 11 Sep 2012 16:35:04 +0000 (10:35 -0600)

Trivial merge