From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 3 Mar 2009 21:38:05 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~3
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=de3329b07d56b1128d20a00da89831a816d8487e;p=monkeysphere.git

Merge commit 'dkg/master'
---

de3329b07d56b1128d20a00da89831a816d8487e