Merge branch 'master' of ssh://sun@ryoko:22003/home/sun/GIT/videosite
authorRalf Ertzinger <sun@lain.camperquake.de>
Fri, 18 Apr 2008 20:14:05 +0000 (22:14 +0200)
committerRalf Ertzinger <sun@lain.camperquake.de>
Fri, 18 Apr 2008 20:14:05 +0000 (22:14 +0200)

Trivial merge