K 10 svn:author V 8 jmallett K 8 svn:date V 27 2010-05-31T23:58:36.874084Z K 7 svn:log V 17 Merge from head. END