Merge branch 'branch-1.0' of ssh://git.gag.com/scm/git/fw/altos into branch-1.0 1.0.3
authorBdale Garbee <bdale@gag.com>
Mon, 26 Dec 2011 02:07:44 +0000 (19:07 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 26 Dec 2011 02:07:44 +0000 (19:07 -0700)

Trivial merge