Merging WinAVR patches