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

Conflicts:
	basis/tools/deploy/shaker/shaker.factor

diff --cc basis/tools/deploy/shaker/shaker.factor
index f8c3b3b0319c1cfd2b796606d4e49ca4b1f3bc86,1060853343b3b0d530dc459c9c201a3018336795..d8a653c02139d927edacaf954d287a9944b153be
--- 1/basis/tools/deploy/shaker/shaker.factor
--- 2/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@@ -7,7 -7,7 +7,7 @@@ sequences.private words memory kernel.p
  vocabs.loader system strings sets vectors quotations byte-arrays
  sorting compiler.units definitions generic generic.standard
  generic.single tools.deploy.config combinators classes
--classes.builtin slots.private grouping command-line ;
++classes.builtin slots.private grouping command-line io.pathnames ;
  QUALIFIED: bootstrap.stage2
  QUALIFIED: classes.private
  QUALIFIED: compiler.crossref