removed stupid diffs from trunk, added fromTrunk.diff to better track merged changes