hpcc-systems/HPCC-Platform — pull request #1150 by ghalliday (2011-12-15 12:24:53+00:00)
Title: Fix shift/reduce errors introduced by MERGE change

Signed-off-by: Gavin Halliday