Merge branch 'reiser4'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Aug 2010 20:00:37 +0000 (22:00 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Aug 2010 20:00:37 +0000 (22:00 +0200)

Trivial merge