srrd/trunk: merged changes from srrd/branches/freebsd revision 1519 to 1572. will have to move some file afterwards…