Fixed merge problems
[xfstests-dev.git] / 010.out