Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 01:49:51 +0000 (19:49 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 13 Sep 2012 01:49:51 +0000 (19:49 -0600)

Trivial merge