octo@huhu:~/liboping $ svn merge -r2:3 trunk branches/liboping-0.1