From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 2 Mar 2009 20:35:59 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~13
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e28afa2fdcb492bf8f07ce5cf1b823f20b6d5e39;p=monkeysphere.git

Merge commit 'dkg/master'
---

e28afa2fdcb492bf8f07ce5cf1b823f20b6d5e39