I've checked this in trunk and 6 branch.

Andrew