Merge branch 'debian' of git://live.debian.net/git/live-boot into debian