iid merge fix

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/timereg@337 edab9b15-3c32-4f9a-a569-739a535b425d
up

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/timereg@338 edab9b15-3c32-4f9a-a569-739a535b425d