Merge branch '2.4' into 3.0

Conflicts:
	lib/Cake/Console/Command/Task/ExtractTask.php
	lib/Cake/Console/ConsoleErrorHandler.php
	lib/Cake/Console/Shell.php
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Controller/Component/EmailComponent.php
	lib/Cake/Core/App.php
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Error/exceptions.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Log/LogEngineCollection.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Validator/ValidationRule.php
	lib/Cake/Model/Validator/ValidationSet.php
	lib/Cake/Network/Email/Email.php
	lib/Cake/Network/Request.php
	lib/Cake/Network/Socket.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Core/AppTest.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/TestApp/tmp/dir_map
	lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
	lib/Cake/Test/TestCase/Console/ShellTest.php
	lib/Cake/Test/TestCase/Network/Email/EmailTest.php
	lib/Cake/Test/TestCase/Network/RequestTest.php
	lib/Cake/Test/TestCase/Routing/RouterTest.php
	lib/Cake/Test/test_app/View/Pages/home.ctp
	lib/Cake/TestSuite/TestSuiteCommand.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/JqueryEngineHelper.php
	lib/Cake/View/Helper/JsBaseEngineHelper.php
	lib/Cake/View/Helper/MootoolsEngineHelper.php
	lib/Cake/View/Helper/PrototypeEngineHelper.php
	lib/Cake/View/ScaffoldView.php