From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 24 Jul 2009 15:08:35 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.26~24
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=478dfc8331177d7397a8430e5d04bffcd601ab2b;p=monkeysphere.git

Merge commit 'dkg/master'
---

478dfc8331177d7397a8430e5d04bffcd601ab2b