CHANGELOG.txt updated
Merge branch 'master' of github.com:ps3mediaserver/ps3mediaserver
Making fix of commit 299201fdef compatible with Mac OSX.
Fixing versions
Merge upstream changes from branch 'ps3mediaserver/master'