From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Fri, 15 Aug 2008 15:53:08 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb45bed4fce593770b4378fbb13e68cf3b68137a;p=monkeysphere.git

Merge commit 'dkg/master'
---

cb45bed4fce593770b4378fbb13e68cf3b68137a