K 10
svn:author
V 6
marcel
K 8
svn:date
V 27
2003-02-02T01:57:31.000000Z
K 7
svn:log
V 98
Unbreak kernel builds caused by what appears to be a merge conflict.
This change has been tested.

END