Muh stuff
Merge branch '4.0-dev' of https://github.com/Pluxbox/pbPlayer into 4.0-dev