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

Trivial merge