git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3411 4b5297f7-1745-476d-ba37-a9c6900126ab