At last, merge the putty-gtk2 branch back into the trunk!