Merge branch 'master' of http://10.200.0.3/GIT/videosite
authorRalf Ertzinger <sun@ryoko-darknet.camperquake.de>
Mon, 8 Dec 2008 14:05:38 +0000 (15:05 +0100)
committerRalf Ertzinger <sun@ryoko-darknet.camperquake.de>
Mon, 8 Dec 2008 14:05:38 +0000 (15:05 +0100)

Trivial merge