From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 1 Mar 2009 01:37:45 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~51
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd9cd0e0d0fa82a6bb537b019c3823bd6d05e229;p=monkeysphere.git

Merge commit 'dkg/master'
---

dd9cd0e0d0fa82a6bb537b019c3823bd6d05e229