[lha - Mon Jan 12 16:22:40 2009]:

> this is dup of 6118

and this patch is based on marcus patch in there, just more complete