K 10 svn:author V 10 nwhitehorn K 8 svn:date V 27 2011-01-13T17:47:22.389626Z K 7 svn:log V 147 Rename some global-shadowing variables, move a function in preparation for a guided partitioning wizard, and add an if that was earlier forgotten. END