Merge branch 'hack-cc1200' of ssh://git.gag.com/scm/git/fw/altos into hack-cc1200 hack-cc1200
authorBdale Garbee <bdale@gag.com>
Sun, 10 Jan 2016 22:31:22 +0000 (15:31 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 10 Jan 2016 22:31:22 +0000 (15:31 -0700)

Trivial merge