Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/monkeysphere
authorMatt Goins <mjgoins@openflows.com>
Sat, 21 Feb 2009 21:54:39 +0000 (16:54 -0500)
committerMatt Goins <mjgoins@openflows.com>
Sat, 21 Feb 2009 21:54:39 +0000 (16:54 -0500)

Trivial merge