Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum
authorBdale Garbee <bdale@gag.com>
Thu, 10 Mar 2011 16:23:59 +0000 (09:23 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 10 Mar 2011 16:23:59 +0000 (09:23 -0700)

Trivial merge