Summary of changes: 87a48bf... fix FTBFS on arm (*) 534f87d... 2.5.4 (*) 42fc063... drop upstreamed patch (*) (*) This commit already existed in another branch; no separate mail sent