From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 1 Feb 2009 04:57:40 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~149^2~2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=666062a6c5e14ac3e54a405d9a52ef3208ff649e;p=monkeysphere.git

Merge commit 'dkg/master'
---

666062a6c5e14ac3e54a405d9a52ef3208ff649e