Merge branch 'toolchain-2.6' of https://git.gitorious.org/orocos-toolchain/ocl into toolchain-2.6
Merge branch 'toolchain-2.6'