beremiz

merge

2014-06-06, mjsousa
f65ab5ff91d1
merge
/**
* No platform specific code for "Generic" target
**/