beremiz

merged forgotten changes

2015-01-16, Edouard Tisserant
7e00c406d346
merged forgotten changes
/**
* No platform specific code for "Generic" target
**/