Merge branch 'master' of http://lair.fifthhorseman.net/~jrollins/git/monkeysphere
authorMatt Goins <mjgoins@openflows.com>
Sun, 22 Jun 2008 23:43:42 +0000 (19:43 -0400)
committerMatt Goins <mjgoins@openflows.com>
Sun, 22 Jun 2008 23:43:42 +0000 (19:43 -0400)

Trivial merge