FYI, today I started working on the BC->trunk merge. I've got a merged tree here, it builds fine and does well on "make check" (without mauve). Tomorrow I'll get Mauve working and try a larger test as well, probably building rhug and eclipse. I'd like to check it in tomorrow evening if all goes well. Tom