K 10 svn:author V 6 brooks K 8 svn:date V 27 2011-06-17T17:43:35.008407Z K 7 svn:log V 58 Merge lots of style and whitespace improvements from bz@. END