From e20d3482fd56ceab653755517790e56183b2d30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?=
 <benedikt.krueger@rwth-aachen.de>
Date: Tue, 2 Aug 2011 12:51:56 +0200
Subject: [PATCH] merge  && test for master

---
 kernel/shell.c | 2 +-
 kernel/tests.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/shell.c b/kernel/shell.c
index a7a8a51d..2e4a0f2a 100644
--- a/kernel/shell.c
+++ b/kernel/shell.c
@@ -17,7 +17,7 @@ char    shellbuffer[512];
 
 void shelldebugprint(char* x)
 {
-    kprintf("debugprinting");
+    kprintf("debugprinting : %s",x);
     if (iamsrv)
         srv_sendBuffer(&srv,emac_id,x,strlen(x));
     else
diff --git a/kernel/tests.c b/kernel/tests.c
index 672dbd91..44316419 100644
--- a/kernel/tests.c
+++ b/kernel/tests.c
@@ -164,7 +164,7 @@ void* server_task(void* e)
     Server	srv;
 
     server_init(&srv,5555,2);
-    SHELLDEBUGPRINTF("created server\n");
+    kprintf("created server\n");
     srv._OnRead = srv_on_read;
     srv._OnDisconnect = srv_on_disc;
     srv._OnConnect = srv_on_conn;