Merge branch 'master' of http://ryoko.camperquake.de/GIT/videosite
authorRalf Ertzinger <sun@ryoko.camperquake.de>
Fri, 18 Jan 2008 19:42:42 +0000 (20:42 +0100)
committerRalf Ertzinger <sun@ryoko.camperquake.de>
Fri, 18 Jan 2008 19:42:42 +0000 (20:42 +0100)

Trivial merge