Patch Set 4: Looks good to me, approved; IP review completed

Looks good. In the Eclipse 3.7 and 4.0 streams, we should strive to work with the Team committers to make sure we don't have to do things like this in the future.