[project @ 2003-12-17 17:15:12 by sof] merge rev. 1.13.2.1
[project @ 2003-12-17 17:15:12 by sof]
merge rev. 1.13.2.1

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