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