Merge branch 'master' of git://anongit.freedesktop.org/wayland

Conflicts:
	clients/window.h

diff --cc clients/terminal.c
Simple merge

diff --cc clients/window.c
Simple merge

diff --cc clients/window.h
index 36ca196,7d6afdc..7d70a78
--- 1/clients/window.h
--- 2/clients/window.h
+++ b/clients/window.h
@@@ -222,14 -211,8 +212,14 @@@ window_set_frame_handler(struct window 
                         window_frame_handler_t handler);
  
  void
- display_set_drag_offer_handler(struct display *display,
-                              display_drag_offer_handler_t handler);
 +window_set_title(struct window *window, const char *title);
 +
 +const char *
 +window_get_title(struct window *window);
 +
 +void
+ display_set_global_handler(struct display *display,
+                          display_global_handler_t handler);
  
  struct wl_drag *
  window_create_drag(struct window *window);