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

diff --cc extra/jamshred/tunnel/tunnel-tests.factor
index 649a6bada78400ad0dd106e0f0febdc546ab7d09,3cc230126c1029e9da347884eabd2f9cf0614a95..80316788960da897c5b716c62ad96ff844f59490
--- 1/extra/jamshred/tunnel/tunnel-tests.factor
--- 2/extra/jamshred/tunnel/tunnel-tests.factor
+++ b/extra/jamshred/tunnel/tunnel-tests.factor
@@@ -1,7 -1,5 +1,7 @@@
 +! Copyright (C) 2007 Alex Chapman
 +! See http://factorcode.org/license.txt for BSD license.
  USING: jamshred.oint jamshred.tunnel kernel sequences tools.test ;
- IN: temporary
+ IN: jamshred.tunnel.tests
  
  [ 0 ] [ T{ segment T{ oint f { 0 0 0 } } 0 }
          T{ segment T{ oint f { 1 1 1 } } 1 }