Merge branch 'master' of ssh://git.gag.com/scm/git/hw/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 21 Jan 2013 08:31:06 +0000 (01:31 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 21 Jan 2013 08:31:06 +0000 (01:31 -0700)

Trivial merge