Merge branch 'master' of http://10.200.0.3/GIT/videosite
authorRalf Ertzinger <sun@ryoko-darknet.camperquake.de>
Mon, 9 Nov 2009 21:55:01 +0000 (22:55 +0100)
committerRalf Ertzinger <sun@ryoko-darknet.camperquake.de>
Mon, 9 Nov 2009 21:55:01 +0000 (22:55 +0100)

Trivial merge