ps3mediaserver/ps3mediaserver — comment on commit 82cfc400652c5f9aabac4ae8c9e57af0173da28c
File:  line 0
By Raptor399:

Indeed, seems to affect the same lines as your commit f7976c4dfac7af2dc24a21746dc08a0a50224b92.
Looks like it could be merged manually, though.