Added some routines from the trunk that were previously links and that svn did not want to commit on the previous commit (with an "Node filename has unexpectedly changed kind" error)