Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 03:26:26 +0000 (21:26 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 25 Aug 2011 03:26:26 +0000 (21:26 -0600)

Trivial merge