merge in site ros site.c from adak-devel