What this patch is:
	This is a functionality only patch.. It should fix the problems
seen previously with the original patch, adressing mainly memory usage,
and crashes.  That's about it.

				PjD-dughi@imaxx.net