Merge branch 'master' of ssh://schlaile@git.misdn.org/var/git/lcr
authorPeter Schlaile <root@asterisk.schlaile.de>
Mon, 22 Sep 2008 18:43:33 +0000 (20:43 +0200)
committerroot <root@asterisk.schlaile.de>
Mon, 22 Sep 2008 18:43:33 +0000 (20:43 +0200)

Trivial merge