Catkinized and commited to groovy-devel. A couple of notes:

- Same content is already commited to fuerte-devel
- Same error noted in the commite to fuerte-devel holds with this commit.