Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sun, 16 Feb 2014 22:53:35 +0000 (15:53 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Feb 2014 22:53:35 +0000 (15:53 -0700)

Trivial merge