From d963bb694cd720447210bc3f74896fb119b2a305 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 15:13:20 +0200
Subject: [PATCH] merge  && test for master

---
 kernel/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/init.c b/kernel/init.c
index 10ca88cc..38da94b8 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -154,8 +154,8 @@ int network_init(void)
 #endif
 
 	// start echo and ping server
-	echo_init();
-	ping_init();
+//	echo_init();
+//	ping_init();
 #endif
 
 	return 0;