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

Trivial merge