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

Conflicts:

	basis/cpu/x86/x86.factor

diff --cc basis/compiler/cfg/instructions/instructions.factor
Simple merge

diff --cc basis/cpu/architecture/architecture.factor
Simple merge

diff --cc basis/cpu/ppc/ppc.factor
Simple merge

diff --cc basis/cpu/x86/x86.factor
Simple merge