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

Conflicts:

	extra/io/unix/unix-tests.factor
	extra/ogg/player/player.factor

diff --cc core/parser/parser.factor
Simple merge

diff --cc core/vocabs/loader/loader.factor
Simple merge

diff --cc extra/furnace/furnace.factor
Simple merge

diff --cc extra/io/unix/unix-tests.factor
index 7fa210d5da35992b51abcaf61e4f83908b62406b,af7417854eb99062dc71ff46ca3f49e291fc3da9..998168ddaa8a2f5fbf2dbc5db16d6552b1a45da0
--- 1/extra/io/unix/unix-tests.factor
--- 2/extra/io/unix/unix-tests.factor
+++ b/extra/io/unix/unix-tests.factor
@@@ -4,28 -4,28 +4,28 @@@ sequences prettyprint system io.encodin
  IN: temporary
  
  ! Unix domain stream sockets
+ : socket-server "unix-domain-socket-test" temp-file ;
+ 
  [
-     [
-         "unix-domain-socket-test" temp-file delete-file
-     ] ignore-errors
+     [ socket-server delete-file ] ignore-errors
  
-     "unix-domain-socket-test" temp-file <local>
+     socket-server <local>
 -    <server> [
 -        stdio get accept [
 +    ascii <server> [
 +        accept [
              "Hello world" print flush
              readln "XYZ" = "FOO" "BAR" ? print flush
          ] with-stream
 -    ] with-stream
 +    ] with-disposal
  
-     "unix-domain-socket-test" temp-file delete-file
+     socket-server delete-file
  ] "Test" spawn drop
  
  yield
  
  [ { "Hello world" "FOO" } ] [
      [
-         "unix-domain-socket-test" temp-file <local>
-         ascii <client> [
 -        socket-server <local> <client>
++        socket-server <local> ascii <client>
+         [
              readln ,
              "XYZ" print flush
              readln ,

diff --cc extra/ogg/player/player.factor
index dab8474d922192e77710b90966e26b21630ad185,e24cee748e08f4bb4fd9706d43bff657398588ef..2a685eccd1cd3a836f6094d6b76fab5a13b5b84b
--- 1/extra/ogg/player/player.factor
--- 2/extra/ogg/player/player.factor
+++ b/extra/ogg/player/player.factor
@@@ -14,8 -14,7 +14,8 @@@ USING: kernel alien ogg ogg.vorbis ogg.
         sequences libc shuffle alien.c-types system openal math\r
         namespaces threads shuffle opengl arrays ui.gadgets.worlds\r
         combinators math.parser ui.gadgets ui.render opengl.gl ui\r
 -       continuations io.files hints combinators.lib sequences.lib debugger ;\r
 +       continuations io.files hints combinators.lib sequences.lib\r
-        io.encodings.binary ;\r
++       io.encodings.binary debugger ;\r
  \r
  IN: ogg.player\r
  \r

diff --cc extra/smtp/smtp.factor
Simple merge

diff --cc extra/webapps/cgi/cgi.factor
Simple merge

diff --cc extra/webapps/file/file.factor
Simple merge