Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
authorAndreas Eversberg <jolly@eversberg.eu>
Wed, 7 Oct 2009 16:51:54 +0000 (18:51 +0200)
committerAndreas Eversberg <jolly@eversberg.eu>
Wed, 7 Oct 2009 16:51:54 +0000 (18:51 +0200)

Trivial merge