I'm going to merge trunk out to the SoC branches and kill the xmpp branch since it's on trunk now unless anyone has any objections. I'll probably start in about 2 hours. Augie