K 10 svn:author V 8 jmallett K 8 svn:date V 27 2010-06-22T18:56:09.983974Z K 7 svn:log V 24 Merge latest from hps@. END