From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 12 Feb 2009 10:45:45 +0000 (-0600)
Subject: Fix conflict
X-Git-Tag: 0.94~2191^2~260
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=312bf5939e1bbddca26107b8951bd7f8da77d6ff

Fix conflict
---

312bf5939e1bbddca26107b8951bd7f8da77d6ff