bringing up to speed with groovy-devel branch.