Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 10 Feb 2011 21:04:11 +0000 (14:04 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 10 Feb 2011 21:04:11 +0000 (14:04 -0700)

Trivial merge