Is this just a copy paste out of the API branch, or are there changes already applied here?
If there isn't any changes, please revert this and SVN COPY them to here, so we keep history