Merged gr-msdd6000 portability fix to trunk (eb/msdd -r8940:9027)