Merge branch 'link_removal' of git://www.jni.nu/cris