Merge branch 'master' of ssh://git.gag.com/scm/git/hw/teleterra master
authorBdale Garbee <bdale@gag.com>
Tue, 30 Apr 2013 22:40:23 +0000 (16:40 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 30 Apr 2013 22:40:23 +0000 (16:40 -0600)
Conflicts:
.gitignore
Makefile


Trivial merge