Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Thu, 20 Feb 2014 20:23:52 +0000 (13:23 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 20 Feb 2014 20:23:52 +0000 (13:23 -0700)

Trivial merge