agree on all counts... but... I *AM* the corporate IT guy
It's my own E2K7 server, and I've made no changes to it.
I'm happy enough though with everything else the last couple builds have brought that this is a nuisance I'm willing to live with. I suppose it's inevitable that at some point I will have to hard reset and build the device back up with no merging, but that's a daunting task I just don't want to deal with if I can help it, what with mail server certs, app tweaks, installed licenses, etc.
I'm hoping the issue just manages to work itself out as automagically as it appeared, by way of subsequent ROM updates and SPB merges (done it dozens of times up to this point using merge level 1, and have had no ill effects).