Merge branch 'mirbsd'; keep lib/error.c