merge completed, this branch is now useless
Authored by: utopiste 2004-08-28
Parent: [r894]
Child: [r896]