Perhaps it would've been different if I'd been a full-blown git wizzard
but this is getting rather painful to test against mainline. Would it be
possible for you to repost (privately or publicly) that which this
depends on against current mainline?
I had to blow away my local trees here and while rebuilding the needed
manual adjustments were just just enough to make me worry that I'd end
up with something not entirely correct.
Rene.
--