Merge from arm-port

author mahi <devnull@localhost>

Thu, 29 Oct 2009 17:01:05 +0000 (18:01 +0100)

committer mahi <devnull@localhost>

Thu, 29 Oct 2009 17:01:05 +0000 (18:01 +0100)
author mahi <devnull@localhost>
Thu, 29 Oct 2009 17:01:05 +0000 (18:01 +0100)
committer mahi <devnull@localhost>
Thu, 29 Oct 2009 17:01:05 +0000 (18:01 +0100)
diff --cc include/Os.h
Simple merge
diff --cc system/kernel/init.c
Simple merge
diff --cc system/kernel/testsystem/test_master.c
Simple merge
author	mahi <devnull@localhost>
	Thu, 29 Oct 2009 17:01:05 +0000 (18:01 +0100)
committer	mahi <devnull@localhost>
	Thu, 29 Oct 2009 17:01:05 +0000 (18:01 +0100)
		1	2
include/Os.h	patch \|	diff1 \|	diff2 \|	blob \| history
system/kernel/init.c	patch \|	diff1 \|	diff2 \|	blob \| history
system/kernel/testsystem/test_master.c	patch \|	diff1 \|	diff2 \|	blob \| history