Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Wed, 16 May 2012 15:13:53 +0000 (09:13 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 16 May 2012 15:13:53 +0000 (09:13 -0600)

Trivial merge