Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Tue, 12 Jan 2010 22:22:11 +0000 (15:22 -0700)
committerBdale Garbee <bdale@gag.com>
Tue, 12 Jan 2010 22:22:11 +0000 (15:22 -0700)

Trivial merge