Merge branch 'deviceIcon' of github.com:samposa/buteo-mtp into deviceIcon
Merge branch 'deviceIcon' of github.com:samposa/buteo-mtp into deviceIcon