octo@huhu:~/liboping $ svn merge -r7:9 branches/liboping-0.1 trunk