[Bug 299435] gcc42/41 fileconflicts