Another merge error, seen on bigendian machines
1 file changed