Stanislav Lem, September 12, 1921 - March 27, 2006
R.I.P.
Two days ago Scooter Software released Beyond Compare 2.4 (change log). If you don't know it: it's my favourite diff 'n' merge tool, which compares files, (FTP) folders, archives, even pictures, file versions and lots more thanks to extensibility interface.