Merge branch 'master' of http://10.200.0.3/GIT/videosite
authorRalf Ertzinger <sun@ryoko-darknet.camperquake.de>
Sun, 28 Dec 2008 15:54:00 +0000 (16:54 +0100)
committerRalf Ertzinger <sun@ryoko-darknet.camperquake.de>
Sun, 28 Dec 2008 15:54:00 +0000 (16:54 +0100)

Trivial merge