From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Fri, 15 Aug 2008 17:50:37 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~15
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e693947aa628b32d4f50c3d5d67db6f41932a2be;p=monkeysphere.git

Merge commit 'dkg/master'
---

e693947aa628b32d4f50c3d5d67db6f41932a2be