timepoints: define #merge_timepoints
Merge pull request #6 from orocos-toolchain/merge_timepoints

timepoints: define #merge_timepoints