Merge commit 'dieterbe/experimental' into experimental

Conflicts solved:
	uzbl.c

1 files changed, 2 insertions, 2 deletions

diff --git a/uzblctrl.c b/uzblctrl.c
index a4fcf1d..93584bc 100644
--- a/uzblctrl.c
+++ b/uzblctrl.c
@@ -23,7 +23,7 @@ static GOptionEntry entries[] =
 int
 main(int argc, char* argv[]) {
     GError *error = NULL;
-    GOptionContext* context = g_option_context_new ("- utility for controlling and interacting with uzbl through its socket file"); //TODO: get stuff back from uzbl
+    GOptionContext* context = g_option_context_new ("- utility for controlling and interacting with uzbl through its socket file"); /* TODO: get stuff back from uzbl */
     g_option_context_add_main_entries (context, entries, NULL);
     g_option_context_add_group        (context, gtk_get_option_group (TRUE));
     g_option_context_parse            (context, &argc, &argv, &error);
@@ -64,7 +64,7 @@ main(int argc, char* argv[]) {
         
         return 0;
     } else {
-        puts ("Usage: uzblctrl -s /path/to/socket -c \"command\"");
+        fprintf(stderr, "Usage: uzblctrl -s /path/to/socket -c \"command\"");
         return 1;
     }
 }