Merge branch 'master' into s3

Conflicts:

	basis/compiler/cfg/optimizer/optimizer.factor

diff --cc basis/compiler/cfg/finalization/finalization.factor
index 0000000000000000000000000000000000000000,3ee7ba06e325968bb7ef221bec9e81e2d7ca9fc6..a5f65d7c78c17e588c6d6ea378d4fc9b783e4ef6
mode 000000,100644..100644
--- /dev/null
--- 2/basis/compiler/cfg/finalization/finalization.factor
+++ b/basis/compiler/cfg/finalization/finalization.factor
@@@ -1,0 -1,15 +1,16 @@@
 -compiler.cfg.linear-scan ;
+ ! Copyright (C) 2010 Slava Pestov.
+ ! See http://factorcode.org/license.txt for BSD license.
+ USING: compiler.cfg.empty-blocks compiler.cfg.gc-checks
+ compiler.cfg.representations compiler.cfg.save-contexts
+ compiler.cfg.ssa.destruction compiler.cfg.build-stack-frame
++compiler.cfg.linear-scan compiler.cfg.scheduling ;
+ IN: compiler.cfg.finalization
+ 
+ : finalize-cfg ( cfg -- cfg' )
+     select-representations
++    schedule-instructions
+     insert-gc-checks
+     insert-save-contexts
+     destruct-ssa
+     linear-scan
+     build-stack-frame ;

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