Merging [316] into 0.6-stable. This closes #200.
Authored by: jonas 2004-03-29
Parent: [r330]
Child: [r332]