Code

octo@huhu:~/liboping $ svn merge -r7:9 branches/liboping-0.1 trunk
authorocto <octo>
Fri, 12 May 2006 15:41:11 +0000 (15:41 +0000)
committerocto <octo>
Fri, 12 May 2006 15:41:11 +0000 (15:41 +0000)

Trivial merge