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

Merge commit 'dkg/master'
---

f5916bc01d76a54d9c2b1738c15da588021c63f3