Added code that had been put in the Web10G branch by mistake.