Merge branch 'extended_classes' into sql_criteria

util/AutoloadBuilder.php

@@ -22,7 +22,7 @@ class AutoloadBuilder
 
     protected $handler;
 
-    protected $regex = '/\n(abstract |final )?(class|interface) ([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)/';
+    protected $regex = '/\n(abstract |final )?(class|interface|trait) ([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)/';
 
     public function __construct($autoload, $dirs = array(), $exclude = array())
     {