Merge pull request #254 from jpirkey/jpirkey-20111018-fix-controller-phpdoc

Fixed controller phpdoc-type of Controller::$Components property

lib/Cake/Controller/Controller.php

@@ -171,7 +171,7 @@ class Controller extends Object {
 /**
  * Instance of ComponentCollection used to handle callbacks.
  *
- * @var string
+ * @var ComponentCollection
  */
 	public $Components = null;