Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2010 17:31:28 +0000 (10:31 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2010 17:31:28 +0000 (10:31 -0700)

Trivial merge