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