From: sheeple <sheeple@oberon.local>
Date: Sat, 26 Sep 2009 08:12:42 +0000 (-0500)
Subject: Merge branch 'slots' of git://factorcode.org/git/factor into slots
X-Git-Tag: 0.97~5475^2~3^2~1
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=01a4047126a253a0cbe46c0aee627a4fd0b74174

Merge branch 'slots' of git://factorcode.org/git/factor into slots

Conflicts:

	basis/cpu/x86/x86.factor
---

01a4047126a253a0cbe46c0aee627a4fd0b74174