Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorKeith Packard <keithp@keithp.com>
Wed, 24 Apr 2013 00:38:41 +0000 (17:38 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 24 Apr 2013 00:38:41 +0000 (17:38 -0700)

Trivial merge