Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/monkeysphere