Summary of changes: f9ae343... change how the screen lock autostarts (*) b19f57e... Merge branch 'f19' (*) This commit already existed in another branch; no separate mail sent