Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Wed, 18 Dec 2013 19:19:31 +0000 (12:19 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 18 Dec 2013 19:19:31 +0000 (12:19 -0700)

Trivial merge