K 10 svn:author V 7 rwatson K 8 svn:date V 27 2007-04-16T15:41:56.000000Z K 7 svn:log V 52 Resolve conflicts from OpenBSM 1.0 alpha 14 import. END