Merge branch 'hotfixes-20111024/josef/for-chris' into btrfs-next-stable