orxonox/branches/avi_play: merged the Trunk back into the branche avi_play again
merged with command svn merge ../trunk/ avi_play/ -r5845:HEAD no conflicts