Merges from Irssi CVS.