Hi This commit failed quite a few times and my working copy was outdated. I hope it hasn't prevented trunk from building. It will take me atleast 15 hours' time to take a look at this once again, so please feel free to make any changes (including reverting the commit) if trunk does not build. Regards Akarsh