Merge branch 'master' of ssh://ryoko:22003/home/sun/GIT/videosite
authorRalf Ertzinger <sun@fred.camperquake.de>
Sun, 16 Aug 2009 10:45:08 +0000 (12:45 +0200)
committerRalf Ertzinger <sun@fred.camperquake.de>
Sun, 16 Aug 2009 10:45:08 +0000 (12:45 +0200)

Trivial merge