Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
authorBdale Garbee <bdale@gag.com>
Wed, 29 Aug 2012 05:39:53 +0000 (23:39 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 29 Aug 2012 05:39:53 +0000 (23:39 -0600)
Conflicts:
debian/control


Trivial merge