Extending CKKW-merging to one-loop matrix elements