Merge in yaffsfs.c changes