orxonox/branches/movie_player: merged the trunk back into the movie_player merged with command: svn merge -r 4014:HEAD ../trunk/ movie_player/ no conflicts