From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 27 Oct 2008 03:10:14 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.17-1~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a8f2f1b6e5557ef8680bd1025239dcfd3f6550f;p=monkeysphere.git

Merge commit 'dkg/master'
---

5a8f2f1b6e5557ef8680bd1025239dcfd3f6550f