Marian Ohligs ed5dba2672 Merge branch 'master' into ohligs ... Conflicts: kernel/tests.c		2011-08-29 14:52:23 +02:00
..
x86	Merge branch 'master' into ohligs	2011-08-29 14:52:23 +02:00