Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
	basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor

diff --cc basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
index 717cf36e14d0a03e3ee3ede5c46c82ae0689a99c,d575450f438e3f23b329ddaf91090ad742c15505..fad1c022ef285dd2aaf1b2b19e34b0960d476080
--- 1/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
--- 2/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
+++ b/basis/compiler/cfg/linear-scan/resolve/resolve-tests.factor
@@@ -1,10 -1,11 +1,11 @@@
 -USING: accessors arrays compiler.cfg compiler.cfg.instructions
 +USING: accessors arrays classes compiler.cfg
- compiler.cfg.instructions compiler.cfg.linear-scan.debugger
++compiler.cfg.debugger compiler.cfg.instructions
+ compiler.cfg.linear-scan.debugger
  compiler.cfg.linear-scan.live-intervals
  compiler.cfg.linear-scan.numbering
  compiler.cfg.linear-scan.resolve compiler.cfg.predecessors
 -compiler.cfg.registers compiler.cfg.rpo
 -compiler.cfg.debugger cpu.architecture kernel
 +compiler.cfg.registers compiler.cfg.rpo cpu.architecture kernel
- multiline namespaces tools.test vectors ;
+ namespaces tools.test vectors ;
  IN: compiler.cfg.linear-scan.resolve.tests
  
  [ { 1 2 3 4 5 6 } ] [