Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Wed, 24 Aug 2011 07:38:58 +0000 (01:38 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 24 Aug 2011 07:38:58 +0000 (01:38 -0600)

Trivial merge