From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 16 Aug 2008 17:08:24 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d31bf789228de4126164e4349f19f288c9e7bb0;p=monkeysphere.git

Merge commit 'dkg/master'
---

9d31bf789228de4126164e4349f19f288c9e7bb0