From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Wed, 3 Sep 2008 20:59:59 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.14-1~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0d37a783d26987fe85f3e609e27df9632dc9387;p=monkeysphere.git

Merge commit 'dkg/master'
---

f0d37a783d26987fe85f3e609e27df9632dc9387