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

Trivial merge