merge from barrucadu

diff --cc TODO
Simple merge

diff --cc uzbl.c
index 85b7cd4,b88027d..3528bf4
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -245,9 -242,9 +245,9 @@@ parse_command(const char *cmd) 
      unsigned int i;
      Command *c = NULL;
      char buffer[512];
-     strcpy(buffer,cmd);
+     strcpy (buffer, cmd);
      char * command_name  = strtok (buffer, " ");
 -    char * command_param = strtok (NULL,  " ,");
 +    gchar * command_param = strtok (NULL,  " ,");
  
      Command *c_tmp = NULL;
      for (i = 0; i < LENGTH (commands); i++) {