Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
authorAndreas Eversberg <andreas@eversberg.eu>
Mon, 27 Oct 2008 22:51:03 +0000 (23:51 +0100)
committerAndreas Eversberg <andreas@eversberg.eu>
Mon, 27 Oct 2008 22:51:03 +0000 (23:51 +0100)

Trivial merge