Marian Ohligs 53d3b0e45d Merge branch 'master' into ohligs ... Conflicts: kernel/tests.c		2011-08-02 16:00:11 +02:00
..
x86	Merge branch 'master' into ohligs	2011-08-02 16:00:11 +02:00