Folks, I'm planning on merging trunk to SoC branches tomorrow. I was going to merge it today, but I want to wait so Sussman and I can do some real-world tests on his merge stuff for svn 1.5. The XMPP branch is on trunk now - it will go away shortly pending some changes to the libgaim repo that have been living in the branch. Thanks, Augie