Merge branch 'master' of http://ryoko.camperquake.de/GIT/videosite
authorRalf Ertzinger <sun@ryoko.camperquake.de>
Sat, 19 Jul 2008 12:18:19 +0000 (14:18 +0200)
committerRalf Ertzinger <sun@ryoko.camperquake.de>
Sat, 19 Jul 2008 12:18:19 +0000 (14:18 +0200)

Trivial merge