Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r4835 -r4858
--- trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4835)
+++ trunk/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 4858)
@@ -781,7 +781,7 @@
 					$this->memoryUsage['print_report']		=	$this->memoryUsage['debugger_finish'] - $this->memoryUsage['debugger_start'];
 					$this->memoryUsage['total']				=	$this->memoryUsage['print_report'] + $this->memoryUsage['error_handling'];
 					$this->memoryUsage['application']		=	memory_get_usage() - $this->memoryUsage['total'];
-					
+					$this->memoryUsage['debugfile_size']	=	filesize($debug_file);
 
 					if ($returnResult) {
 						$ret = ob_get_contents();
@@ -815,21 +815,36 @@
 			function getMemoryUsageReport()
 			{
 				$info = Array(
-								'printReport'	=>	'print_report',
-								'saveError'		=>	'error_handling',
-								'Total'			=>	'total',
-								'Application'	=>	'application'
+								'Application'	=>	'MEM:application',
+								'Script runtime'=>	'PROFILE:script_runtime',
+								'-'				=>	'SEP:-',
+								'printReport'	=>	'MEM:print_report',
+								'saveError'		=>	'MEM:error_handling',
+								'Debug Total'	=>	'MEM:total',
+								'Debug FileSize'=>	'MEM:debugfile_size'
 						);
 						
-				$ret = '<table class="dbg_flat_table">';
+				$ret = '';
 				foreach ($info as $title => $value_key) {
-					$ret .= '<tr><td>'.$title.':</td><td><b>'.$this->formatSize($this->memoryUsage[$value_key]).'</b></td></tr>';
+					list ($record_type, $record_data) = explode(':', $value_key, 2);
+					switch ($record_type) {
+						case 'MEM':
+							$ret .= '<tr><td>'.$title.':</td><td><b>'.$this->formatSize($this->memoryUsage[$record_data]).'</b> ('.$this->memoryUsage[$record_data].')</td></tr>';
+							break;
+							
+						case 'PROFILE':
+							$Data =& $this->ProfilerData[$record_data];
+							$profile_time = ($Data['ends'] - $Data['begins']); // in seconds
+							$ret .= '<tr><td>'.$title.':</td><td><b>'.sprintf('%.5f', $profile_time).'s</b></td></tr>';
+							break;
+								
+						case 'SEP':
+							$ret .= '<tr><td colspan="2"><hr /></td></tr>';
+							break;
+					}
 				}
 				
-				$Data =& $this->ProfilerData['script_runtime'];
-				$runtime = ($Data['ends'] - $Data['begins']); // in seconds
-				$ret .= '<tr><td>Script runtime:</td><td><b>'.sprintf('%.5f', $runtime).'s</b></td></tr></table>';
-				return $ret;
+				return '<br /><table class="dbg_stats_table">'.$ret.'</table>';
 			}