<auto> merging hotfixes. re-added tests into repository.

tests/application/controllers/template/override.php

@@ -0,0 +1,26 @@
+<?php
+
+class TemplateStub {
+	
+	public function __toString()
+	{
+		return 'TemplateStub';
+	}
+
+}
+
+class Template_Override_Controller extends Controller {
+
+	public $layout = 'home.index';
+
+	public function action_index()
+	{
+		//
+	}
+
+	public function layout()
+	{
+		return 'Layout';
+	}
+
+}