Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Wed, 19 Jan 2011 19:59:49 +0000 (12:59 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 19 Jan 2011 19:59:49 +0000 (12:59 -0700)

Trivial merge