Merge branch 'master' of http://factorcode.org/git/factor into semantic-db

Conflicts:

	extra/db/sqlite/sqlite.factor

diff --cc extra/db/sqlite/sqlite.factor
index 5cb8f0c3bdefb2e0e8753ec62d4d3e4fb7066699,b980e99718ece96d005ea164f076f4178560d4f7..1d927494b3985e25f140c348c3313d7e9497fcc1
--- 1/extra/db/sqlite/sqlite.factor
--- 2/extra/db/sqlite/sqlite.factor
+++ b/extra/db/sqlite/sqlite.factor
@@@ -1,10 -1,11 +1,11 @@@
  ! Copyright (C) 2005, 2008 Chris Double, Doug Coleman.
  ! See http://factorcode.org/license.txt for BSD license.
  USING: alien arrays assocs classes compiler db
 -hashtables io.files kernel math math.parser namespaces
 +hashtables io.files io.files.tmp kernel math math.parser namespaces
  prettyprint sequences strings tuples alien.c-types
  continuations db.sqlite.lib db.sqlite.ffi db.tuples
- words combinators.lib db.types combinators tools.walker ;
+ words combinators.lib db.types combinators tools.walker
+ combinators.cleave ;
  IN: db.sqlite
  
  TUPLE: sqlite-db path ;
@@@ -33,11 -26,10 +34,10 @@@ TUPLE: sqlite-statement 
  
  TUPLE: sqlite-result-set has-more? ;
  
 -M: sqlite-db <simple-statement> ( str -- obj )
 +M: sqlite-db <simple-statement> ( str in out -- obj )
      <prepared-statement> ;
  
 -M: sqlite-db <prepared-statement> ( str -- obj )
 +M: sqlite-db <prepared-statement> ( str in out -- obj )
-     db get db-handle 
      {
          set-statement-sql
          set-statement-in-params

diff --cc extra/db/tuples/tuples.factor
Simple merge