From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 21:30:50 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~9
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=d8692549051e028ea0e10dc224d2073ad3773949;p=monkeysphere.git

Merge commit 'dkg/master'
---

d8692549051e028ea0e10dc224d2073ad3773949