From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 19 Feb 2009 08:59:52 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.23~44^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=810526da4461212bb4ec50afec7237268df1afb7;p=monkeysphere.git

Merge commit 'dkg/master'
---

810526da4461212bb4ec50afec7237268df1afb7