From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Wed, 29 Oct 2008 05:40:21 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.19-1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4dbd96969a8e844b71a167238bc126d66155c31;p=monkeysphere.git

Merge commit 'dkg/master'
---

e4dbd96969a8e844b71a167238bc126d66155c31