For anyone wondering, the previous imports were part of some cleanup of the CVS tree. The conflicts were intentional and not important. I'll be doing some more of this here and there to smooth out some bubbles in the 4.4-Lite integrations. ------------------------------------------------------------------------------