texinfo: file conflict
Merge branch 'master' of https://github.com/pisilinux/PisiLinux