forgot to update fromTrunk.diff