K 10 svn:author V 4 kris K 8 svn:date V 27 2000-06-03T07:31:44.000000Z K 7 svn:log V 66 Bring vendor patches onto the main branch, and resolve conflicts. END