Merge branch 'master' of ssh://jolly@www.misdn.org/var/git/lcr
authorAndreas Eversberg <jolly@eversberg.eu>
Fri, 12 Nov 2010 08:25:33 +0000 (09:25 +0100)
committerAndreas Eversberg <jolly@eversberg.eu>
Fri, 12 Nov 2010 08:25:33 +0000 (09:25 +0100)

Trivial merge