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

Merge commit 'dkg/master'
---

fccf552603e35a3b7419d0d6925c03ab24576ee9