Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Mon, 22 Aug 2011 22:08:55 +0000 (16:08 -0600)
committerBdale Garbee <bdale@gag.com>
Mon, 22 Aug 2011 22:08:55 +0000 (16:08 -0600)

Trivial merge