Merge branch 'master' of ssh://sun@ryoko:22003/home/sun/GIT/videosite
authorRalf Ertzinger <sun@lain.camperquake.de>
Sun, 7 Dec 2008 22:15:16 +0000 (23:15 +0100)
committerRalf Ertzinger <sun@lain.camperquake.de>
Sun, 7 Dec 2008 22:15:16 +0000 (23:15 +0100)

Trivial merge