From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 19 Aug 2008 21:20:24 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.11-1~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06af6a530911d53038b1f0a0b4864146efe5bb9b;p=monkeysphere.git

Merge commit 'dkg/master'
---

06af6a530911d53038b1f0a0b4864146efe5bb9b