Merge branch 'master' of https://github.com/01org/parameter-framework
Merge branch 'master' of https://github.com/kir0gawa/parameter-framework