Merge commit 'otoburb/master' into merge-otoburb

Conflicts:

	basis/ui/backend/gtk/gtk.factor

diff --cc basis/ui/backend/gtk/gtk.factor
index 5f219ec20c8c7b2084a7950fcd28cc56000a15fa,c61080d832b18836a02594da742f7d3dfa102ee0..5169d880cd0d6863088f53eef3ea8f478304165e
--- 1/basis/ui/backend/gtk/gtk.factor
--- 2/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@@ -1,15 -1,14 +1,16 @@@
- ! Copyright (C) 2010, 2011 Anton Gorenko, Philipp Brüschweiler.
 -! Copyright (C) 2010 Anton Gorenko, Philipp Brüschweiler.
++! Copyright (C) 2010, 2011 Anton Gorenko, Philipp Bruschweiler.
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors alien.accessors alien.c-types alien.data
- alien.strings arrays assocs classes.struct command-line continuations
- destructors gdk.ffi gdk.gl.ffi glib.ffi
- gobject-introspection.standard-types gobject.ffi gtk.ffi gtk.gl.ffi
- io.encodings.utf8 kernel libc literals locals math math.bitwise
- math.order math.vectors namespaces sequences strings system threads ui
- ui.backend ui.backend.gtk.input-methods ui.backend.gtk.io
- ui.clipboards ui.event-loop ui.gadgets ui.gadgets.private
- ui.gadgets.worlds ui.gestures ui.pixel-formats
- ui.pixel-formats.private ui.private vocabs.loader ;
 -alien.strings arrays assocs classes.struct command-line destructors
 -environment gdk.ffi gdk.gl.ffi glib.ffi gobject-introspection.standard-types
 -gobject.ffi gtk.ffi gtk.gl.ffi io.encodings.utf8 kernel libc literals
 -locals math math.bitwise math.order math.vectors namespaces sequences
++alien.strings arrays assocs classes.struct command-line
++continuations destructors environment gdk.ffi gdk.gl.ffi
++glib.ffi gobject-introspection.standard-types gobject.ffi
++gtk.ffi gtk.gl.ffi io.encodings.utf8 kernel libc literals locals
++math math.bitwise math.order math.vectors namespaces sequences
+ strings system threads ui ui.backend ui.backend.gtk.input-methods
+ ui.backend.gtk.io ui.clipboards ui.event-loop ui.gadgets
 -ui.gadgets.private ui.gadgets.worlds ui.gestures ui.pixel-formats
 -ui.pixel-formats.private ui.private vocabs.loader ;
++ui.gadgets.private ui.gadgets.worlds ui.gestures
++ui.pixel-formats ui.pixel-formats.private ui.private
++vocabs.loader ;
  IN: ui.backend.gtk
  
  SINGLETON: gtk-ui-backend