Merge branch 'master' into 2.0

Conflicts:
	cake/libs/controller/components/request_handler.php
	cake/libs/view/pages/home.ctp
	cake/libs/view/view.php
	cake/tests/cases/libs/view/view.test.php
	lib/Cake/Cache/Engine/FileEngine.php
	lib/Cake/Config/config.php
	lib/Cake/Console/cake
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/VERSION.txt

cake/tests/test_app/views/elements/test_element.xml

@@ -0,0 +1 @@
+<p>test element</p>

lib/Cake/Model/Behavior/TranslateBehavior.php

@@ -169,21 +169,16 @@ public function beforeFind($model, $query) {
 						$query['fields'][] = 'i18n_'.$field;
 					}
 					$query['joins'][] = array(
-						'type' => 'LEFT',
+						'type' => 'INNER',
 						'alias' => 'I18n__'.$field,
 						'table' => $joinTable,
 						'conditions' => array(
 							$model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}.foreign_key"),
 							'I18n__'.$field.'.model' => $model->name,
-							'I18n__'.$field.'.'.$RuntimeModel->displayField => $aliasField
+							'I18n__'.$field.'.'.$RuntimeModel->displayField => $field,
+							'I18n__'.$field.'.locale' => $locale
 						)
 					);
-
-					if (is_string($query['conditions'])) {
-						$query['conditions'] = $db->conditions($query['conditions'], true, false, $model) . ' AND '.$db->name('I18n__'.$field.'.locale').' = \''.$locale.'\'';
-					} else {
-						$query['conditions'][$db->name("I18n__{$field}.locale")] = $locale;
-					}
 				}
 			}
 		}