reorganize tree to merge projects

git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/2.6@4813 a612230a-c5fa-0310-af8b-88eea846685b
Fix svn:externals for sipX*/config.
This fix is needed (even in this very old branch) so svncopy works
correctly on newer branches.


git-svn-id: http://scm.sipfoundry.org/rep/sipX/branches/2.6@7204 a612230a-c5fa-0310-af8b-88eea846685b