K 10 svn:author V 8 lstewart K 8 svn:date V 27 2012-11-27T06:20:40.559431Z K 7 svn:log V 135 Reverse the merge of r240494 from head. It needs to be done again, but this time remembering to move the DIFFUSE code to its new home. END