Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorRobert Garbee <robert@gag.com>
Wed, 18 Jul 2012 20:25:27 +0000 (14:25 -0600)
committerRobert Garbee <robert@gag.com>
Wed, 18 Jul 2012 20:25:27 +0000 (14:25 -0600)

Trivial merge