From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 31 Jan 2009 23:34:06 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~158^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93527967c043c99c708e209502292cf276877bf9;p=monkeysphere.git

Merge commit 'dkg/master'
---

93527967c043c99c708e209502292cf276877bf9