Merge branch 'reiser4'