K 10 svn:author V 3 sam K 8 svn:date V 27 2009-01-12T21:30:22.908406Z K 7 svn:log V 98 re-merge build infrastructure sync w/ HEAD from r187106; fixes some stuff I missed the first time END