trunk.. same deal as changeset:6526