Integrate changes from 2.2.1 on gentoo build (now correct for mindi-busybox) and mandriva official packages (now generated correctly)