vchoi_fork

[svn-r25013] Purpose:
    Merge of r24416 from the trunk
    Fixes a number of compiler warnings in the dsets test.

Tested on:
    32-bit LE linux (jam) - very minor changes, mostly casts