Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Tue, 9 Apr 2013 00:02:37 +0000 (18:02 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 9 Apr 2013 00:02:37 +0000 (18:02 -0600)

Trivial merge