flo: changes for linaro