Merge PR#52 from xhaakon/master
[buteo-mtp] Fix build of mtpserver
Merge pull request #53 from nemomobile/fixmtpserver

[buteo-mtp] Fix build of mtpserver