K 10 svn:author V 6 gerald K 8 svn:date V 27 2015-04-10T13:35:27.265857Z K 7 svn:log V 316 Revert the bogus half of the previous commit (which added COMPHOLIO to OPTIONS_DEFAULT). The other half, which is actually desirable, moved extraction of the Compholio/Staging patchset from the pre-configure target to the post-extract target which allows us to actually add local patches for this patchset as well. END