Fixing merge with upstream

application/bootstrap.php

@@ -36,6 +36,11 @@ ini_set('unserialize_callback_func', 'spl_autoload_call');
 
 //-- Configuration and initialization -----------------------------------------
 
+/**
+ * Set the default language
+ */
+I18n::lang('en-us');
+
 /**
  * Set Kohana::$environment if $_ENV['KOHANA_ENV'] has been supplied.
  * 

example.htaccess

@@ -2,7 +2,7 @@
 RewriteEngine On
 
 # Installation directory
-RewriteBase /kohana/
+RewriteBase /
 
 # Protect hidden files from being viewed
 <Files .*>

index.php

@@ -82,6 +82,22 @@ if (file_exists('install'.EXT))
 	return include 'install'.EXT;
 }
 
+if ( ! defined('KOHANA_START_TIME'))
+{
+	/**
+	 * Define the start time of the application, used for profiling.
+	 */
+	define('KOHANA_START_TIME', microtime(TRUE));
+}
+
+if ( ! defined('KOHANA_START_MEMORY'))
+{
+	/**
+	 * Define the memory usage at the start of the application, used for profiling.
+	 */
+	define('KOHANA_START_MEMORY', memory_get_usage());
+}
+
 // Load the core Kohana class
 require SYSPATH.'classes/kohana/core'.EXT;