From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 23 Jun 2008 23:33:54 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.3-1~3^2~2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=91bf57bac7bed32937c13595044158007e7b5812;p=monkeysphere.git

Merge commit 'dkg/master'
---

91bf57bac7bed32937c13595044158007e7b5812