working again with the 3.3 trunk
working again with the 3.3 trunk