Merge branch 'branch-1.5' of ssh://git.gag.com/scm/git/fw/altos into branch-1.5
authorBdale Garbee <bdale@gag.com>
Sat, 13 Sep 2014 23:57:11 +0000 (17:57 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Sep 2014 23:57:11 +0000 (17:57 -0600)

Trivial merge