Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 20 Nov 2012 19:37:38 +0000 (12:37 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 20 Nov 2012 19:37:38 +0000 (12:37 -0700)

Trivial merge