K 10 svn:author V 6 obrien K 8 svn:date V 27 2009-03-12T05:10:17.000000Z K 7 svn:log V 86 Now that the build break is quickly dealt with, update the description and conflicts. END