Merge pull request #329 from symfony-cmf/update-from-1.3

Update master from 1.3

Author: lsmith77

Admin/RouteAdmin.php

@@ -174,7 +174,7 @@ protected function configureFieldsForDefaults($dynamicDefaults)
             $defaults['_format'] = array('_format', Sf2CompatUtil::getFormTypeName('text'), array('required' => true));
         }
         if ($route && $route->getOption('add_locale_pattern')) {
-            $defaults['_locale'] = array('_format', Sf2CompatUtil::getFormTypeName('text'), array('required' => false));
+            $defaults['_locale'] = array('_locale', Sf2CompatUtil::getFormTypeName('text'), array('required' => false));
         }
 
         return $defaults;