[ros-diffs] [CVS reactos] This is a merge onto head of the last two months worth of changes to the