Merge branch 'vfsconf'
authorMichael Neumann <mneumann@ntecs.de>
Wed, 17 Dec 2008 15:50:04 +0000 (15:50 +0000)
committerMichael Neumann <mneumann@ntecs.de>
Wed, 17 Dec 2008 15:50:04 +0000 (15:50 +0000)

Trivial merge