[project @ 2003-12-17 17:13:47 by sof] merge rev 1.48.2.4
[project @ 2003-12-17 17:13:47 by sof]
merge rev 1.48.2.4

shockkolate/containers,iu-parfunc/containers,iu-parfunc/containers,meiersi/psqueues-old,Zigazou/containers,iu-parfunc/containers,hvr/containers,ekmett/containers,shockkolate/containers,ekmett/containers,beni55/pretty,shockkolate/containers,ekmett/containers,Zigazou/containers,Zigazou/containers,hvr/containers,hvr/containers