From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 2 Sep 2008 03:57:50 +0000 (-0700)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.12-1~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0e5a29df930f53cacfb7526b166ca1c6d4fbd25a;p=monkeysphere.git

Merge commit 'dkg/master'
---

0e5a29df930f53cacfb7526b166ca1c6d4fbd25a