Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router