From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 4 Aug 2008 16:28:38 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~63^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb9ad81061f6dbe1f5a0abfd284d04a927a9c961;p=monkeysphere.git

Merge commit 'dkg/master'
---

eb9ad81061f6dbe1f5a0abfd284d04a927a9c961