Conflicts: cake/libs/controller/components/auth.php cake/tests/cases/libs/controller/components/auth.test.php