Merge commit 'dieterbe/experimental' into experimental

Conflicts solved:
	uzbl.c

diff --cc uzbl.c
index a596b0e,b9e5d68..8ed8788
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -987,11 -882,13 +987,14 @@@ keycmd_nl (WebKitWebView *page, GArray 
  }
  
  static void
 -keycmd_bs (WebKitWebView *page, GArray *argv) {
 +keycmd_bs (WebKitWebView *page, GArray *argv, GString *result) {
+     gchar *prev;
      (void)page;
      (void)argv;
 +    (void)result;
-     g_string_truncate(uzbl.state.keycmd, uzbl.state.keycmd->len - 1);
+     prev = g_utf8_find_prev_char(uzbl.state.keycmd->str, uzbl.state.keycmd->str + uzbl.state.keycmd->len);
+     if (prev)
+       g_string_truncate(uzbl.state.keycmd, prev - uzbl.state.keycmd->str);
      update_title();
  }
  

diff --cc uzblctrl.c
Simple merge