From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sun, 25 May 2008 20:02:04 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.1-1~17^2~6
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=ec55ca0c26b054a63265947b50e0392060b2a7e0;p=monkeysphere.git

Merge commit 'dkg/master'

Conflicts:
---

ec55ca0c26b054a63265947b50e0392060b2a7e0