This should convert branch fluidcontrol files to trunk compatible ones
fix typo in last commit