Merge branch 'planet'

Conflicts:

	extra/rss/rss.factor

diff --cc extra/rss/rss.factor
index 0d399e620fa96ab61a4bc574c3a39f1faa8d82c2,458f09642f629d7bd332ed2c9c9fa4d36a202a25..1f7105bf57fd49badfd4462a6c339592f2319006
--- 1/extra/rss/rss.factor
--- 2/extra/rss/rss.factor
+++ b/extra/rss/rss.factor
@@@ -1,12 -1,10 +1,10 @@@
- ! Copyright (C) 2006 Chris Double.
+ ! Copyright (C) 2006 Chris Double, Daniel Ehrenberg.
  ! See http://factorcode.org/license.txt for BSD license.
  IN: rss
- ! USING: kernel http-client xml xml-utils xml-data errors io strings
- !    sequences xml-writer parser-combinators lazy-lists entities ;
 -USING: xml.utilities kernel promises parser-combinators assocs
 +USING: xml.utilities kernel assocs
      strings sequences xml.data xml.writer
      io.streams.string combinators xml xml.entities io.files io
-     http.client ;
+     http.client namespaces xml.generator hashtables ;
  
  : ?children>string ( tag/f -- string/f )
      [ children>string ] [ f ] if* ;

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