Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr