Had to recreate the patch almost from scratch. Haven't seen this problem before--when the git merge failed, it wouldn't create any .rej files to work with.
Recreated patch is same as Steve's, except for a test configuration change to match current MASTER.
import January 7, 2011 at 7:31 PM
Comment made by: scgilardi
I provided a patch for this. Is there anything further I can or must do to to move it along?
import September 30, 2010 at 8:42 PM
Comment made by: importer
scgilardi said: I'm working on this now. I plan to have more info by 19 October.