hpcc-systems/HPCC-Platform — pull request #6540 by ghalliday (2014-10-16 13:17:39+00:00)
Title: HPCC-12422 Fix compile errors caused by rebase

Signed-off-by: Gavin Halliday