merging benjamin branch Original author: Frederic Peters <fpeters@0d.be> Date: 2008-03-28 18:57:10.522000+01:00