K 10 svn:author V 5 danfe K 8 svn:date V 27 2010-10-09T08:20:49.000000Z K 7 svn:log V 148 Convert patch which does not apply in every case now to inplace editing, and thus unbreak legacy drivers build. Do some minor cleanups while here. END