vcdimager: rebuild for new cdio
Merge branch 'master' of github.com:pisilinux/PisiLinux

Conflicts: