[ros-diffs] [CVS reactos@ELF_support] Painful HEAD merge. CVS makes my existence miserable