coreos/coreos-overlay — pull request #456 by marineam (2014-03-19 04:33:45+00:00)
Title: fix(coreos-base/*init): Retry conflict fix from e8403520

Too many in-flight things meant the fix didn't fix things. Re-bump.