ps3mediaserver/ps3mediaserver — comment on commit f23755b86aeb9aa7b15e784a142b7b1c57c4b060
File:  line 0
By chocolateboy:

Gah! Now [I'm doing it](e257484)! Try [this](http://gitready.com/advanced/2009/02/11/pull-with-rebase.html).