K 10 svn:author V 3 jsa K 8 svn:date V 27 2012-01-09T04:09:41.000000Z K 7 svn:log V 95 Remove now redundant #include patch, and fix conflicting 7.x patch. Approved by: wxs (mentor) END