Merge branch 'branch-1.2' of ssh://git.gag.com/scm/git/fw/altos into branch-1.2
authorBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:31:48 +0000 (09:31 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 21 May 2013 15:31:48 +0000 (09:31 -0600)

Trivial merge