K 10 svn:author V 8 jmallett K 8 svn:date V 27 2010-07-06T10:10:35.924615Z K 7 svn:log V 17 Merge from head. END