> I fixed it up (see below) and can carry the fix as necessary.I rebased the series onto 3.7-rc7 (using the same merge fix that you did) ... so you shouldn't see the merge error next time.-Tony