48b7b9
Merge branch 'master' into f20 Two patches are backed out: key-slot crypttab option and --full-by-default.