Merging mess, I really prefer git.

git-svn-id: https://svn.modelica.org/projects/ExternalMediaLibrary/trunk@7439 7ce873d0-865f-4ce7-a662-4bb36ea78beb