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

Conflicts:
	README

diff --combined README
index f423b62,c7cac53..8c0d65a
--- 1/README
--- 2/README
+++ b/README
@@@ -520,7 -520,6 +520,7 @@@ Changes after Version 1.
   -> Just add 'extern' right below your external interface definition, or give
      external interface name in routing.conf: ": extern interfaces=XXXXX"
  - Added experimental CCITT No. 5 signalling system. (for educational purpose)
+ - Added socket owner/group options to options.conf
 +- Fixed/simplyfied config parser. The last digit of the last line was ignored.
  
  
-