Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Sat, 12 Jan 2013 17:57:22 +0000 (10:57 -0700)
committerBdale Garbee <bdale@gag.com>
Sat, 12 Jan 2013 17:57:22 +0000 (10:57 -0700)

Trivial merge