Import of the trunk from the old Quamoco SVN