K 10 svn:author V 8 jmallett K 8 svn:date V 27 2010-06-02T04:13:10.671450Z K 7 svn:log V 47 Merge from head, mainly to get pmap build fix. END