Merge branch '2.1' of github.com:cakephp/cakephp into 2.1

lib/Cake/Console/Command/Task/ModelTask.php

@@ -426,6 +426,8 @@ class ModelTask extends BakeTask {
 					$guess = $methods['uuid'];
 				} elseif ($metaData['type'] == 'string') {
 					$guess = $methods['notempty'];
+				} elseif ($metaData['type'] == 'text') {
+					$guess = $methods['notempty'];
 				} elseif ($metaData['type'] == 'integer') {
 					$guess = $methods['numeric'];
 				} elseif ($metaData['type'] == 'boolean') {