Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 27 Apr 2010 17:58:22 +0000 (11:58 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 27 Apr 2010 17:58:22 +0000 (11:58 -0600)

Trivial merge