merge changeset 19771 from trunk (GROOVY-3953 reversion)

git-svn-id: http://svn.codehaus.org/groovy/branches/GROOVY_1_7_X@19773 a5544e8c-8a19-0410-ba12-f9af4593a198
4 files changed