Merge commit 'ac9ac0ffe6043e5a4f0fd74786315763be6821c5'
Merge branch 'master-mk01' of https://github.com/mk01/xbian-initramfs
Merge branch 'master' of https://github.com/xbianonpi/xbian-initramfs
just updated variable names in the merged piece