Clebert - I have reviewed this and paging, can you commit into TRUNK now.

I have quite a few issues/queries to go through with you but these can be done once it is in trunk.