Merge branch 'for-chris-fixed' of git://git.jan-o-sch.net/btrfs-unstable