From: Joe Groff <arcata@gmail.com>
Date: Mon, 13 Jun 2011 18:28:02 +0000 (-0700)
Subject: Merge remote branch 'erikc/master'
X-Git-Tag: 0.97~4323^2
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=40c45e08cab4609b306c1d2cd7027b90c948f05f

Merge remote branch 'erikc/master'
---

40c45e08cab4609b306c1d2cd7027b90c948f05f