a64fcd2893
Pulling in @philips' changes from coreos/coreos-cloudinit#6 after trashing PR coreos/coreos-cloudinit#20. Cleanup of that PR was beyond my git-fu. cc @jonboulle