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

Conflicts:

	extra/html/elements/elements.factor
	extra/html/html.factor
	extra/tar/tar.factor
	extra/webapps/pastebin/pastebin.factor

Resolving my stupid use conflict

diff --cc extra/cryptlib/streams/streams.factor
index 750d2a426c45a986eb75088995ee2b678aec3016,828476d2e2b19cea5ad8eb7c82d55ecf5d9f3aa9..04106285e0b7ae7e5c9226dd3c30f825f46bb84e
--- 1/extra/cryptlib/streams/streams.factor
--- 2/extra/cryptlib/streams/streams.factor
+++ b/extra/cryptlib/streams/streams.factor
@@@ -1,9 -1,9 +1,9 @@@
  ! Copyright (C) 2007 Matthew Willis
  ! See http://factorcode.org/license.txt for BSD license.
- USING: cryptlib cryptlib.libcl kernel alien sequences
+ USING: cryptlib cryptlib.libcl kernel alien sequences continuations
  byte-arrays namespaces io.buffers math generic io strings
  io.streams.lines io.streams.plain io.streams.duplex combinators
 -alien.c-types ;
 +alien.c-types continuations ;
  
  IN: cryptlib.streams
  

diff --cc extra/html/html.factor
index 0860ae6c487093c0933c380a00bd29a488c395cc,b5b0a5e2a9bef1f450e16fe3cb0ef8f7256948e3..06199373328514c21387f73b7c9129e3025ecf74
--- 1/extra/html/html.factor
--- 2/extra/html/html.factor
+++ b/extra/html/html.factor
@@@ -1,9 -1,9 +1,9 @@@
  ! Copyright (C) 2004, 2006 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
- USING: generic assocs help http io io.styles io.files
+ USING: generic assocs help http io io.styles io.files continuations
  io.streams.string kernel math math.parser namespaces
  quotations assocs sequences strings words html.elements
 -xml.writer xml.entities sbufs ;
 +xml.entities sbufs continuations ;
  IN: html
  
  GENERIC: browser-link-href ( presented -- href )

diff --cc extra/tar/tar.factor
index 3bce7df9d6ad6ee8ab53ecc3160e5058b68ad72a,d3412568fe1f752f0008dcf017ab6792afdabdcf..363ce6b412cc72acefcae78b9c344ea990249a5b
--- 1/extra/tar/tar.factor
--- 2/extra/tar/tar.factor
+++ b/extra/tar/tar.factor
@@@ -1,7 -1,6 +1,8 @@@
 -USING: combinators io io.files io.streams.duplex continuations
 -io.streams.string kernel math math.parser
 -namespaces pack prettyprint sequences strings system hexdump ;
++<<<<<<< HEAD:extra/tar/tar.factor
 +USING: combinators io io.files io.streams.duplex
 +io.streams.string kernel math math.parser continuations
 +namespaces pack prettyprint sequences strings system ;
 +USING: hexdump tools.interpreter ;
  IN: tar
  
  : zero-checksum 256 ;

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