From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Tue, 3 Mar 2009 21:26:50 +0000 (-0500)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.24~4
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6fa8d69f50b581cddfa3ec7ec05c2d4479765ab4;hp=-c;p=monkeysphere.git

Merge commit 'dkg/master'
---

6fa8d69f50b581cddfa3ec7ec05c2d4479765ab4