merge of '4e808662b364403781cd4e899198db521c13afc9'
[vuplus_openembedded] / packages / openmoko-projects / diversity-daemon / .mtn2git_empty