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

Conflicts:
	core/generic/generic-tests.factor

diff --cc core/generic/generic-tests.factor
index 9d6721c44bbcb4acaf53155c004db281d676c47e,fc6f50e18f55e5d8ba56121951085dd100459b0a..1691ca8932c7118559da0b9751b6c9676101b220
--- 1/core/generic/generic-tests.factor
--- 2/core/generic/generic-tests.factor
+++ b/core/generic/generic-tests.factor
@@@ -1,8 -1,9 +1,9 @@@
- USING: accessors alien arrays definitions generic generic.standard
- generic.math assocs hashtables io kernel math namespaces parser
- prettyprint sequences strings tools.test vectors words
- quotations classes classes.algebra classes.tuple continuations
- layouts classes.union sorting compiler.units eval io.streams.string ;
 -USING: accessors alien arrays definitions generic
 -generic.standard generic.math assocs hashtables io kernel math
 -math.order namespaces parser prettyprint sequences strings
 -tools.test vectors words quotations classes classes.algebra
 -classes.tuple continuations layouts classes.union sorting
 -compiler.units eval multiline io.streams.string ;
++USING: accessors alien arrays assocs classes classes.algebra
++classes.tuple classes.union compiler.units continuations
++definitions eval generic generic.math generic.standard
++hashtables io io.streams.string kernel layouts math math.order
++namespaces parser prettyprint quotations sequences sorting
++strings tools.test vectors words ;
  IN: generic.tests
  
  GENERIC: foobar ( x -- y )
@@@ -195,4 -202,4 +196,4 @@@ M: slice foozul 
      fixnum \ <=> method-for-class
      real \ <=> method
      eq?
--] unit-test
++] unit-test