Oh well. There's always one more bug :-)
Has this patch already been applied to the 4.0 tarball on sourceforge?