Merge branch '2.0' into 2.1

lib/Cake/Network/CakeResponse.php

@@ -187,6 +187,8 @@ class CakeResponse {
 		'mp3' => 'audio/mpeg',
 		'mpga' => 'audio/mpeg',
 		'ogg' => 'audio/ogg',
+		'oga' => 'audio/ogg',
+		'spx' => 'audio/ogg',
 		'ra' => 'audio/x-realaudio',
 		'ram' => 'audio/x-pn-realaudio',
 		'rm' => 'audio/x-pn-realaudio',
@@ -194,6 +196,7 @@ class CakeResponse {
 		'snd' => 'audio/basic',
 		'tsi' => 'audio/TSP-audio',
 		'wav' => 'audio/x-wav',
+		'aac' => 'audio/aac',
 		'asc' => 'text/plain',
 		'c' => 'text/plain',
 		'cc' => 'text/plain',
@@ -225,6 +228,9 @@ class CakeResponse {
 		'qt' => 'video/quicktime',
 		'viv' => 'video/vnd.vivo',
 		'vivo' => 'video/vnd.vivo',
+		'ogv' => 'video/ogg',
+		'webm' => 'video/webm',
+		'mp4' => 'video/mp4',
 		'gif' => 'image/gif',
 		'ief' => 'image/ief',
 		'jpe' => 'image/jpeg',

lib/Cake/View/Helper/HtmlHelper.php

@@ -73,6 +73,7 @@ class HtmlHelper extends AppHelper {
 		'tag' => '<%s%s>%s</%s>',
 		'tagstart' => '<%s%s>',
 		'tagend' => '</%s>',
+		'tagselfclosing' => '<%s%s/>',
 		'para' => '<p%s>%s</p>',
 		'parastart' => '<p%s>',
 		'label' => '<label for="%s"%s>%s</label>',