diff --git a/wp-admin/css/media.css b/wp-admin/css/media.css
index 62860a7663..fb86e84bbe 100644
--- a/wp-admin/css/media.css
+++ b/wp-admin/css/media.css
@@ -109,11 +109,17 @@ form.media-upload-form {
 	background: url(../images/align-right.png) no-repeat center left;
 }
 
-.media-upload-form fieldset#image-size label {
+#flash-upload-ui, .insert-gallery {
+	display: none;
+}
+
+tr.image-size label {
 	display: inline;
 	margin: 0 1em 0 0;
 }
-
+tr.image-size td.field {
+	text-align: center;
+}
 .pinkynail {
 	max-width: 40px;
 	max-height: 40px;
@@ -187,11 +193,11 @@ span.filename {
 .describe input[type="text"], .describe textarea {
 	width: 460px;
 }
-.describe a.delete {
+a.delete {
 	display: block;
 	text-align: center;
-	line-height: 24px;
 	width: 100%;
+	color: #246;
 }
 .describe-toggle-on, .describe-toggle-off {
 	line-height: 36px;
diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php
index b8ae190bb7..ca3ab38873 100644
--- a/wp-admin/edit-attachment-rows.php
+++ b/wp-admin/edit-attachment-rows.php
@@ -46,16 +46,17 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 
 	case 'media':
 		?>
-		<td><strong><a href="# TODO: upload.php?action=edit&post=<?php the_ID(); ?>"><?php the_title(); ?></a></strong>
+		<td><strong><a href="# TODO: upload.php?action=edit&post=<?php the_ID(); ?>"><?php the_title(); ?></a></strong><br />
+		<?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', $post->guid)); ?>
+		<?php do_action('manage_media_media_column', $post->ID); ?>
+		</td>
 		<?php
-		// TODO
 		break;
 
 	case 'desc':
 		?>
-		<td><?php has_excerpt() ? the_excerpt() : null; ?></td>
+		<td><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td>
 		<?php
-		// TODO
 		break;
 
 	case 'date':
@@ -92,12 +93,11 @@ foreach($posts_columns as $column_name=>$column_display_name) {
 		?>
 		<td><a href="<?php the_permalink(); ?>"><?php _e('Permalink'); ?></a></td>
 		<?php
-		// TODO
 		break;
 
 	default:
 		?>
-		<td><?php do_action('manage_posts_custom_column', $column_name, $id); ?></td>
+		<td><?php do_action('manage_media_custom_column', $column_name, $id); ?></td>
 		<?php
 		break;
 	}
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index e65474265c..cfe7bbae93 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -35,198 +35,6 @@ function the_image_upload_tabs() {
 	}
 }
 
-function image_upload_callback() {
-	$tabs = image_upload_tabs();
-	if ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) && is_callable($_GET['tab']) )
-		return $_GET['tab']();
-	elseif ( is_callable($first = array_shift(array_keys($tabs))) )
-		return $first();
-	else
-		return image_upload_handler();
-}
-
-add_action('media_upload_image', 'image_upload_callback');
-
-function image_upload_form( $action_url, $values = array(), $error = null ) {
-	$action_url = attribute_escape( $action_url );
-	$image_alt = attribute_escape( @$values['image-alt'] );
-	$image_url = attribute_escape( @$values['image-url'] );
-	$image_title = attribute_escape( @$values['image-title'] );
-	$image_align = @$values['image-url'];
-	$post_id = $_GET['post_id'];
-
-?>
-<div id="media-upload-header">
-<h3><?php _e('Add Image') ?></h3>
-<?php the_image_upload_tabs(); ?>
-</div>
-<div id="media-upload-error">
-<?php if ($error) {
-	echo $error->get_error_message();
-} ?>
-</div>
-<script type="text/javascript">
-<!--
-
-jQuery(document).ready(function(){
-	var swfu = new SWFUpload({
-			upload_url : "<?php echo get_option('siteurl').'/wp-admin/async-upload.php'; ?>",
-			flash_url : "<?php echo get_option('siteurl').'/wp-includes/js/swfupload/swfupload_f9.swf'; ?>",
-			file_post_name: "async-upload",
-			swfupload_element_id : "flash-upload-ui", // id of the element displayed when swfupload is available
-			degraded_element_id : "html-upload-ui",   // when swfupload is unavailable
-			//file_types : "*.jpg;*.gif;*.png",
-			file_size_limit : "<?php echo wp_max_upload_size(); ?> B",
-			post_params : {
-				"post_id" : "<?php echo $post_id; ?>",
-				"auth_cookie" : "<?php echo $_COOKIE[AUTH_COOKIE]; ?>",
-				"type" : "image",
-			},
-			swfupload_loaded_handler : uploadLoadedImage,
-			upload_progress_handler : uploadProgressImage,
-			upload_success_handler : uploadSuccessImage,
-			upload_error_handler: uploadError,
-			file_queued_handler : fileQueuedImage,
-			file_queue_error_handler : fileQueueError,
-			file_dialog_complete_handler : fileDialogComplete,
-
-			custom_settings : {
-				progressTarget : "flash-upload-ui",
-				cancelButtonId : "btnCancel2"
-			},
-
-			debug: false,
-
-		});
-
-	document.getElementById("flash-browse-button").onclick = function () { swfu.selectFile(); };
-});
-//-->
-</script>
-<form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($action_url); ?>" id="image-upload" class="media-upload-form">
-<p id="flash-upload-ui">
-	<label for="flash-browse-button"><?php _e('Choose image'); ?></label>
-	<input id="flash-browse-button" type="button" value="<?php _e('Browse'); ?>" />
-	<label for="image-file" class="form-help"><?php _e('Only PNG, JPG, GIF'); ?></label></p>
-<p id="html-upload-ui"><label for="image-file"><?php _e('Choose image'); ?></label>
-	<input type="file" name="image-file" id="image-file" />
-	<label for="image-file" class="form-help"><?php _e('Only PNG, JPG, GIF'); ?></label></p>
-<p><label for="image-alt" class="required"><?php _e('&lt;alt&gt; (required)'); ?></label>
-	<input type="text" name="image-alt" id="image-alt" />
-	<label for="image-alt" class="form-help"><?php _e('e.g., The Mona Lisa'); ?></label></p>
-<p><label for="image-url"><?php _e('URL'); ?></label>
-	<input type="text" name="image-url" id="image-url" />
-	<label for="image-url" class="form-help"><?php _e('e.g., http://www.wordpress.org/'); ?></label></p>
-<p><label for="image-title"><?php _e('&lt;title&gt;'); ?></label>
-	<input type="text" name="image-title" id="image-title" />
-	<label for="image-url" class="form-help"><?php _e('e.g., The Mona Lisa, one of many paintings in the Louvre'); ?></label></p>
-<fieldset id="image-align">
-	<legend><?php _e('Alignment'); ?></legend>
-	<input type="radio" name="image-align" id="image-align-none" value="none" <?php if ($image_align == 'none' || !$image_align) echo ' checked="checked"'; ?>/>
-	<label for="image-align-none" id="image-align-none-label"><?php _e('None'); ?></label>
-	<input type="radio" name="image-align" id="image-align-left" value="left" <?php if ($image_align == 'left') echo ' checked="checked"'; ?>/>
-	<label for="image-align-left" id="image-align-left-label"><?php _e('Left'); ?></label>
-	<input type="radio" name="image-align" id="image-align-center" value="center"  <?php if ($image_align == 'center') echo ' checked="checked"'; ?>/>
-	<label for="image-align-center" id="image-align-center-label"><?php _e('Center'); ?></label>
-	<input type="radio" name="image-align" id="image-align-right" value="right"  <?php if ($image_align == 'right') echo ' checked="checked"'; ?>/>
-	<label for="image-align-right" id="image-align-right-label"><?php _e('Right'); ?></label>
-</fieldset>
-<fieldset id="image-size">
-	<legend><?php _e('Size'); ?></legend>
-	<input type="radio" name="image-size" id="image-size-thumb" value="thumb" <?php if ($image_size == 'thumb') echo ' checked="checked"'; ?>/>
-	<label for="image-size-thumb" id="image-size-thumb-label"><?php _e('Thumbnail'); ?></label>
-	<input type="radio" name="image-size" id="image-size-medium" value="medium" <?php if ($image_size == 'medium' || !$image_size) echo ' checked="checked"'; ?>/>
-	<label for="image-size-medium" id="image-size-medium-label"><?php _e('Medium'); ?></label>
-	<input type="radio" name="image-size" id="image-size-full" value="full" <?php if ($image_size == 'full') echo ' checked="checked"'; ?>/>
-	<label for="image-size-full" id="image-size-full-label"><?php _e('Full size'); ?></label>
-</fieldset>
-<p>
-	<button name="image-add" id="image-add" class="button-ok" value="1"><?php _e('Add Image'); ?></button>
-	<a href="#" onClick="return top.tb_remove();" id="image-cancel" class="button-cancel"><?php _e('Cancel'); ?></a>
-</p>
-	<input type="hidden" name="post_id" value="<?php echo attribute_escape($post_id); ?>" />
-	<?php wp_nonce_field( 'inlineuploading' ); ?>
-</form>
-<?php
-}
-
-function image_upload_handler() {
-
-	if ( !current_user_can('upload_files') ) {
-		return new wp_error( 'upload_not_allowed', __('You are not allowed to upload files.') );
-	}
-
-	if ( empty($_POST['image-add']) ) {
-		// no button click, we're just displaying the form
-		wp_iframe( 'image_upload_form', get_option('siteurl') . '/wp-admin/media-upload.php?type=image' );
-	}
-	else {
-		// Add Image button was clicked
-		check_admin_referer('inlineuploading');
-
-		// if the async flash uploader was used, the attachment has already been inserted and its ID is passed in post.
-		// otherwise this is a regular form post and we still have to handle the upload and create the attachment.
-		if ( !empty($_POST['attachment_id']) ) {
-			$id = intval($_POST['attachment_id']);
-			// store the title and alt into the attachment post
-			wp_update_post(array(
-				'ID' => $id,
-				'post_title' => $_POST['image-title'],
-				'post_content' => $_POST['image-alt'],
-			));
-		}
-		else {
-			$id = image_upload_post();
-		}
-
-		// if the input was invalid, redisplay the form with its current values
-		if ( is_wp_error($id) )
-			wp_iframe( 'image_upload_form', get_option('siteurl') . '/wp-admin/media-upload.php?type=image', $_POST, $id );
-		else {
-			media_send_to_editor(get_image_send_to_editor($id, $_POST['image-alt'], $_POST['image-title'], $_POST['image-align'], $_POST['image-url'], true, $_POST['image-size']));
-		}
-	}
-}
-
-// this returns html to include in the single image upload form when the async flash upload has finished
-// i.e. show a thumb of the image, and include the attachment id as a hidden input
-function async_image_callback($id) {
-	$thumb_url = wp_get_attachment_thumb_url($id);
-	if ( empty($thumb_url) )
-		$thumb_url = wp_mime_type_icon($id);
-
-	if ($thumb_url) {
-		$out = '<p><input type="hidden" name="attachment_id" id="attachment_id" value="'.intval($id).'" />'
-			. '<img src="'.wp_get_attachment_thumb_url($id).'" class="pinkynail" /> '
-			. basename(wp_get_attachment_url($id)).'</p>';
-	}
-	else {
-		$out = '<p><input type="hidden" name="attachment_id" id="attachment_id" value="'.intval($id).'" />'
-			. basename(wp_get_attachment_url($id)).'</p>';
-	}
-
-	$post = get_post($id);
-	$title = addslashes($post->post_title);
-	$alt = addslashes($post->post_content);
-
-	// populate the input fields with post data (which in turn comes from exif/iptc)
-	$out .= <<<EOF
-<script type="text/javascript">
-<!--
-jQuery('#image-alt').val('{$alt}').attr('disabled', false);
-jQuery('#image-title').val('{$title}').attr('disabled', false);
-jQuery('#image-url').attr('disabled', false);
-jQuery('#image-add').attr('disabled', false);
--->
-</script>
-EOF;
-
-	return $out;
-}
-
-add_filter('async_upload_image', 'async_image_callback');
-
-
 function get_image_send_to_editor($id, $alt, $title, $align, $url='', $rel = false, $size='medium') {
 
 	$html = get_image_tag($id, $alt, $title, $align, $rel, $size);
@@ -254,45 +62,6 @@ top.tb_remove();
 	exit;
 }
 
-// this handles the file upload POST itself, validating input and inserting the file if it's valid
-function image_upload_post() {
-	if ( empty($_FILES['image-file']['name']) )
-		return new wp_error( 'image_file_required', __('Please choose an image file to upload') );
-	if ( empty($_POST['image-alt']) )
-		return new wp_error( 'image_alt_required', __('Please enter an &lt;alt&gt; description') );
-
-	$overrides = array('test_form'=>false);
-	$file = wp_handle_upload($_FILES['image-file'], $overrides);
-
-	if ( isset($file['error']) )
-		return new wp_error( 'upload_error', $file['error'] );
-
-	$url = $file['url'];
-	$type = $file['type'];
-	$file = $file['file'];
-
-	$post_title = trim($_POST['image-title']);
-	$post_content = trim($_POST['image-alt']);
-	$post_parent = intval($_POST['parent_post_id']);
-
-	// Construct the attachment array
-	$attachment = array(
-		'post_title' => $post_title,
-		'post_content' => $post_content,
-		'post_type' => 'attachment',
-		'post_parent' => $post_parent,
-		'post_mime_type' => $type,
-		'guid' => $url
-	);
-
-	// Save the data
-	$id = wp_insert_attachment($attachment, $file, $post_parent);
-	if ( !is_wp_error($id) )
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-
-	return $id;
-}
-
 // this handles the file upload POST itself, creating the attachment post
 function media_handle_upload($file_id, $post_id, $post_data = array()) {
 	$overrides = array('test_form'=>false);
@@ -371,24 +140,12 @@ if ( is_string($content_func) )
 <?php
 }
 
-function media_buttons() { // just a placeholder for now
+function media_buttons() {
 	global $post_ID, $temp_ID;
 	$uploading_iframe_ID = (int) (0 == $post_ID ? $temp_ID : $post_ID);
-	$image_upload_iframe_src = wp_nonce_url("media-upload.php?type=image&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
-	$image_upload_iframe_src = apply_filters('image_upload_iframe_src', $image_upload_iframe_src);
-	$multimedia_upload_iframe_src = wp_nonce_url("media-upload.php?type=multimedia&amp;post_id=$uploading_iframe_ID", 'inlineuploading');
+	$multimedia_upload_iframe_src = "media-upload.php?type=multimedia&amp;post_id=$uploading_iframe_ID";
 	$multimedia_upload_iframe_src = apply_filters('multimedia_upload_iframe_src', $multimedia_upload_iframe_src);
-	$out = <<<EOF
-
-<a href="{$image_upload_iframe_src}&TB_iframe=true&height=550&width=480" class="thickbox"><img src='images/media-button-image.gif' alt='' /></a>
-<a href="{$multimedia_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-gallery.gif' alt='' /></a>
-<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-video.gif' alt='' /></a>
-<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-music.gif' alt='' /></a>
-<a href="{$image_upload_iframe_src}&TB_iframe=true&height=500&width=640" class="thickbox"><img src='images/media-button-other.gif' alt='' /></a>
-
-
-EOF;
-	echo $out;
+	echo "<a href='$multimedia_upload_iframe_src&TB_iframe=true&height=500&width=640' class='button thickbox'>" . __('Add media'). '</a>';
 }
 add_action( 'media_buttons', 'media_buttons' );
 
@@ -522,11 +279,12 @@ function get_attachment_taxonomies($attachment) {
 function image_attachment_fields_to_edit($form_fields, $post) {
 	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
 		$form_fields['post_title']['required'] = true;
-		$form_fields['post_excerpt']['label'] = __('Alternate Text');
-		$form_fields['post_content']['label'] = __('Description');
+		$form_fields['post_excerpt']['label'] = __('Description');
+		$form_fields['post_excerpt']['helps'][] = __('Alternate text, e.g. "The Mona Lisa"');
 
-		if ( strlen(trim($post->post_excerpt)) == 0 )
-			$form_fields['post_excerpt']['helps'][] = __('Alternate Text helps people who can not see the image.');
+		$form_fields['post_content']['label'] = __('Long Description');
+
+		$thumb = wp_get_attachment_thumb_url();
 
 		$form_fields['_send']['url'] = array(
 			'label' => __('Link URL'),
@@ -547,6 +305,17 @@ function image_attachment_fields_to_edit($form_fields, $post) {
 				<input type='radio' name='attachments[$post->ID][align]' id='image-align-right-$post->ID' value='right' />
 				<label for='image-align-right-$post->ID' class='align image-align-right-label'>" . __('Right') . "</label>\n",
 		);
+		$form_fields['_send']['image-size'] = array(
+			'label' => __('Size'),
+			'input' => 'html',
+			'html'  => "
+				" . ( $thumb ? "<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-thumb-$post->ID' value='thumb' />
+				<label for='image-size-thumb-$post->ID'>" . __('Thumbnail') . "</label>
+				" : '' ) . "<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-medium-$post->ID' value='medium' checked='checked' />
+				<label for='image-size-medium-$post->ID'>" . __('Medium') . "</label>
+				<input type='radio' name='attachments[$post->ID][image-size]' id='image-size-full-$post->ID' value='full' />
+				<label for='image-size-full-$post->ID'>" . __('Full size') . "</label>",
+		);
 	}
 	return $form_fields;
 }
@@ -581,7 +350,12 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) {
 		else
 			$align = 'none';
 
-		return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel);
+		if ( !empty($attachment['image-size']) )
+			$size = $attachment['image-size'];
+		else
+			$size = 'medium';
+
+		return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size);
 	}
 
 	return $html;
@@ -603,11 +377,11 @@ function get_attachment_fields_to_edit($post, $errors = null) {
 			'value'      => $edit_post->post_title,
 		),
 		'post_excerpt' => array(
-			'label'      => __('Excerpt'),
+			'label'      => __('Description'),
 			'value'      => $edit_post->post_excerpt,
 		),
 		'post_content' => array(
-			'label'      => __('Description'),
+			'label'      => __('Long description'),
 			'value'      => $edit_post->post_content,
 			'input'      => 'textarea',
 			'helps'      => array(__('If filled, the default link URL will be the attachment permalink.')),
@@ -637,25 +411,21 @@ function get_attachment_fields_to_edit($post, $errors = null) {
 	// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
 	// The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
 	$form_fields = array_merge_recursive($form_fields, (array) $errors);
-	
+
 	$form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
 
 	return $form_fields;
 }
 
 function get_multimedia_item( $attachment_id, $errors = null, $send = true ) {
-	$thumb_url = wp_get_attachment_thumb_url( $attachment_id );
-	if ( empty($thumb_url) )
-		$thumb_url = wp_mime_type_icon( $attachment_id );
-	if ( empty($thumb_url) && ( $post =& get_post( $attachment_id ) ) && substr($post->post_mime_type, 0, 5) == 'image' )
-			$thumb_url = wp_get_attachment_url( $attachment_id );
+	$thumb_url = array_shift(get_attachment_icon_src( $attachment_id ));
 
 	$title_label = __('Title');
 	$description_label = __('Description');
 	$tags_label = __('Tags');
 
-	$toggle_on = __('Describe');
-	$toggle_off = __('Describe &laquo;');
+	$toggle_on = __('Show');
+	$toggle_off = __('Hide');
 
 	$post = get_post($attachment_id);
 
@@ -697,12 +467,12 @@ function get_multimedia_item( $attachment_id, $errors = null, $send = true ) {
 	$send = "<input type='submit' value='" . wp_specialchars(__('Send to Editor'), 1) . "' id='send[$attachment_id]' name='send[$attachment_id]' />";
 
 	if ( empty($form_fields['save']) && empty($form_fields['_send']) ) {
-		$form_fields['save'] = array('tr' => "\t\t<tr class='submit'><td colspan='2' class='del'><a id='del[$attachment_id]' class='delete' href='$delete_href'>$delete</a></td><td class='savesend'>$save$send</td></tr>\n");
+		$form_fields['save'] = array('tr' => "\t\t<tr class='submit'><td colspan='2' class='del'><a id='del[$attachment_id]' class='delete button' href='$delete_href'>$delete</a></td><td class='savesend'>$save$send</td></tr>\n");
 	} elseif ( empty($form_fields['save']) ) {
 		$form_fields['save'] = array('tr' => "\t\t<tr class='submit'><td></td><td></td><td class='savesend'>$save</td></tr>\n");
 		foreach ( $form_fields['_send'] as $id => $field )
 			$form_fields[$id] = $field;
-		$form_fields['send'] = array('tr' => "\t\t<tr class='submit'><td colspan='2' class='del'><a id='del[$attachment_id]' class='delete' href='$delete_href'>$delete</a></td><td class='savesend'>$send</td>");
+		$form_fields['send'] = array('tr' => "\t\t<tr class='submit'><td colspan='2' class='del'><a id='del[$attachment_id]' class='delete button' href='$delete_href'>$delete</a></td><td class='savesend'>$send</td>");
 	}
 
 	$hidden_fields = array();
@@ -773,13 +543,15 @@ function multimedia_upload_form( $errors = null ) {
 
 ?>
 <div id="media-upload-header">
-<h3><?php _e('Add Images'); ?></h3>
+<h3><?php _e('Add Media'); ?></h3>
+<?php the_image_upload_tabs(); ?>
 </div>
-	<div id="media-upload-error">
+
+<div id="media-upload-error">
 <?php if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) { ?>
 	<?php echo $errors['upload_error']->get_error_message(); ?>
 <?php } ?>
-	</div>
+</div>
 <script type="text/javascript">
 <!--
 jQuery(function($){
@@ -795,14 +567,14 @@ jQuery(function($){
 			},
 			swfupload_element_id : "flash-upload-ui", // id of the element displayed when swfupload is available
 			degraded_element_id : "html-upload-ui",   // when swfupload is unavailable
-			swfupload_loaded_handler : uploadLoadedMultimedia,
-			//upload_start_handler : uploadStart,
-			upload_progress_handler : uploadProgressMultimedia,
-			//upload_error_handler : uploadError,
-			upload_success_handler : uploadSuccessMultimedia,
-			upload_complete_handler : uploadCompleteMultimedia,
+			swfupload_loaded_handler : uploadLoaded,
 			file_dialog_start_handler : fileDialogStart,
-			file_queued_handler : fileQueuedMultimedia,
+			file_queued_handler : fileQueued,
+			upload_start_handler : uploadStart,
+			upload_progress_handler : uploadProgress,
+			upload_error_handler : uploadError,
+			upload_success_handler : uploadSuccess,
+			upload_complete_handler : uploadComplete,
 			file_queue_error_handler : fileQueueError,
 			file_dialog_complete_handler : fileDialogComplete,
 
@@ -810,21 +582,21 @@ jQuery(function($){
 		});
 	$("#flash-browse-button").bind( "click", function(){swfu.selectFiles();});
 	var preloaded = $(".multimedia-item.preloaded");
-	if ( preloaded ) {
+	if ( preloaded.length > 0 ) {
 		jQuery('#insert-multimedia').attr('disabled', '');
-		preloaded.each(function(){uploadSuccessMultimedia({id:this.id.replace(/[^0-9]/g, '')},'');});
+		preloaded.each(function(){uploadSuccess({id:this.id.replace(/[^0-9]/g, '')},'');});
 	}
-	$("a.delete").bind('click',function(){$.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/del/,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});$(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){$(this).remove();});return false;});
 });
 //-->
 </script>
-<p id="flash-upload-ui" style="display:none">
-	<input id="flash-browse-button" type="button" value="<?php _e('Choose Files'); ?>" />
-	<label for="image-file" class="form-help"><?php _e('Only PNG, JPG, GIF'); ?></label>
-</p>
 
 <form enctype="multipart/form-data" method="post" action="<?php echo attribute_escape($form_action_url); ?>" class="media-upload-form">
 
+<div id="flash-upload-ui">
+	<p><input id="flash-browse-button" type="button" value="<?php _e('Choose files to upload'); ?>" class="button" /></p>
+	<p><?php _e('As each upload completes, you can add titles and descriptions below.'); ?></p>
+</div>
+
 <div id="html-upload-ui">
 	<p><label for="async-upload"><?php _e('Choose image'); ?></label>
 	<input type="file" name="async-upload" id="async-upload" />
@@ -838,8 +610,6 @@ jQuery(function($){
 	<br style="clear:both" />
 </div>
 
-
-
 <div id="multimedia-items">
 
 <?php echo get_multimedia_items($post_id, $errors); ?>
@@ -847,8 +617,7 @@ jQuery(function($){
 </div>
 
 <p class="submit">
-	<a href="#" onClick="return top.tb_remove();" id="image-cancel" class="button-cancel"><?php _e('Cancel'); ?></a>
-	<input type="submit" class="submit" id="insert-multimedia" name="insert-multimedia" value="<?php _e('Insert gallery into post'); ?>" disabled="disabled" />
+	<input type="submit" class="submit insert-gallery" name="insert-multimedia" value="<?php _e('Insert gallery into post'); ?>" />
 </p>
 
 <?php wp_nonce_field('multimedia-form'); ?>
@@ -862,20 +631,30 @@ add_action('admin_head_multimedia_upload_form', 'media_admin_css');
 add_filter('async_upload_multimedia', 'get_multimedia_item', 10, 2);
 add_filter('media_upload_multimedia', 'multimedia_upload_handler');
 
+
 // Any 'attachment' taxonomy will be included in the description input form for the multi uploader
 // Example:
+/*
 register_taxonomy(
-	// 
 	'image_people',
 	'attachment:image',
 	array(
 		'label' => __('People'),
-		'template' => __('People: %s'),
+		'template' => __('People: %l'),
+		'helps' => __('Left to right, top to bottom.'),
 		'sort' => true,
 		'args' => array(
 			'orderby' => 'term_order'
 		)
 	)
 );
+*/
+/*
+register_taxonomy('movie_director', 'attachment:video', array('label'=>__('Directors'), 'template'=>__('Directed by %l.')));
+register_taxonomy('movie_producer', 'attachment:video', array('label'=>__('Producers'), 'template'=>__('Produced by %l.')));
+register_taxonomy('movie_screenwriter', 'attachment:video', array('label'=>__('Screenwriter'), 'template'=>__('Screenplay by %l.')));
+register_taxonomy('movie_actor', 'attachment:video', array('label'=>__('Cast'), 'template'=>array(__('Cast: %l.')));
+register_taxonomy('movie_crew', 'attachment:video', array('label'=>__('Crew'), 'template'=>array(__('Crew: %l.')));
+*/
 
 ?>
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 2c6020082c..4156ec4f65 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -125,6 +125,8 @@ add_filter('comment_excerpt', 'convert_chars');
 add_filter('list_cats', 'wptexturize');
 add_filter('single_post_title', 'wptexturize');
 
+add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2);
+
 // RSS filters
 add_filter('the_title_rss', 'strip_tags');
 add_filter('the_title_rss', 'ent2ncr', 8);
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 241701e133..67cff31138 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1277,4 +1277,97 @@ function wp_pre_kses_less_than_callback( $matches ) {
 	return $matches[0];
 }
 
+/**
+ * wp_sprintf() - sprintf() with filters
+ */
+function wp_sprintf( $pattern ) {
+	$args = func_get_args( );
+	$len = strlen($pattern);
+	$start = 0;
+	$result = '';
+	$arg_index = 0;
+	while ( $len > $start ) {
+		// Last character: append and break
+		if ( strlen($pattern) - 1 == $start ) {
+			$result .= substr($pattern, -1);
+			break;
+		}
+
+		// Literal %: append and continue
+		if ( substr($pattern, $start, 2) == '%%' ) {
+			$start += 2;
+			$result .= '%';
+			continue;
+		}
+
+		// Get fragment before next %
+		$end = strpos($pattern, '%', $start + 1);
+		if ( false === $end )
+			$end = $len;
+		$fragment = substr($pattern, $start, $end - $start);
+
+		// Fragment has a specifier
+		if ( $pattern{$start} == '%' ) {
+			// Find numbered arguments or take the next one in order
+			if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
+				$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';
+				$fragment = str_replace("%{$matches[1]}$", '%', $fragment);
+			} else {
+				++$arg_index;
+				$arg = isset($args[$arg_index]) ? $args[$arg_index] : '';
+			}
+
+			// Apply filters OR sprintf
+			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
+			if ( $_fragment != $fragment )
+				$fragment = $_fragment;
+			else
+				$fragment = sprintf($fragment, strval($arg) );
+		}
+
+		// Append to result and move to next fragment
+		$result .= $fragment;
+		$start = $end;
+	}
+	return $result;
+}
+
+/**
+ * wp_sprintf_l - List specifier %l for wp_sprintf
+ *
+ * @param unknown_type $pattern
+ * @param unknown_type $args
+ * @return unknown
+ */
+function wp_sprintf_l($pattern, $args) {
+	// Not a match
+	if ( substr($pattern, 0, 2) != '%l' )
+		return $pattern;
+
+	// Nothing to work with
+	if ( empty($args) )
+		return '';
+
+	// Translate and filter the delimiter set (avoid ampersands and entities here)
+	$l = apply_filters('wp_sprintf_l', array(
+		'between'          => _c(', |between list items'),
+		'between_last_two' => _c(', and |between last two list items'),
+		'between_only_two' => _c(' and |between only two list items'),
+		));
+
+	$args = (array) $args;
+	$result = array_shift($args);
+	if ( count($args) == 1 )
+		$result .= $l['between_two'] . array_shift($args);
+	// Loop when more than two args
+	while ( count($args) ) {
+		$arg = array_shift($args);
+		if ( $i == 1 )
+			$result .= $l['between_last_two'] . $arg;
+		else
+			$result .= $l['between'] . $arg;
+	}
+	return $result . substr($pattern, 2);
+}
+
 ?>
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index c5be59fc2e..9d416142a1 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -941,8 +941,7 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button
 	
 	if ( $media_buttons ) { ?>
 		<div id="media-buttons">
-		<?php _e('Add media:'); ?>
-		<?php do_action( 'media_buttons'); ?>
+		<?php do_action( 'media_buttons' ); ?>
 		</div>
 	<?php } ?>
 	</div>
diff --git a/wp-includes/images/audio.png b/wp-includes/images/audio.png
new file mode 100644
index 0000000000..7b2a854e3b
Binary files /dev/null and b/wp-includes/images/audio.png differ
diff --git a/wp-includes/images/css.png b/wp-includes/images/css.png
new file mode 100644
index 0000000000..038e34de7f
Binary files /dev/null and b/wp-includes/images/css.png differ
diff --git a/wp-includes/images/default.png b/wp-includes/images/default.png
new file mode 100644
index 0000000000..c551227fb7
Binary files /dev/null and b/wp-includes/images/default.png differ
diff --git a/wp-includes/images/doc.png b/wp-includes/images/doc.png
new file mode 100644
index 0000000000..e4e62a1dcc
Binary files /dev/null and b/wp-includes/images/doc.png differ
diff --git a/wp-includes/images/exe.png b/wp-includes/images/exe.png
new file mode 100644
index 0000000000..d9942655bf
Binary files /dev/null and b/wp-includes/images/exe.png differ
diff --git a/wp-includes/images/html.png b/wp-includes/images/html.png
new file mode 100644
index 0000000000..ed81af1599
Binary files /dev/null and b/wp-includes/images/html.png differ
diff --git a/wp-includes/images/js.png b/wp-includes/images/js.png
new file mode 100644
index 0000000000..e0862d3515
Binary files /dev/null and b/wp-includes/images/js.png differ
diff --git a/wp-includes/images/pdf.png b/wp-includes/images/pdf.png
new file mode 100644
index 0000000000..b4d5f9c09d
Binary files /dev/null and b/wp-includes/images/pdf.png differ
diff --git a/wp-includes/images/swf.png b/wp-includes/images/swf.png
new file mode 100644
index 0000000000..156e3e4a1e
Binary files /dev/null and b/wp-includes/images/swf.png differ
diff --git a/wp-includes/images/tar.png b/wp-includes/images/tar.png
new file mode 100644
index 0000000000..0468ef83d5
Binary files /dev/null and b/wp-includes/images/tar.png differ
diff --git a/wp-includes/images/text.png b/wp-includes/images/text.png
new file mode 100644
index 0000000000..10bcf5e94b
Binary files /dev/null and b/wp-includes/images/text.png differ
diff --git a/wp-includes/images/video.png b/wp-includes/images/video.png
new file mode 100644
index 0000000000..f822ac4a13
Binary files /dev/null and b/wp-includes/images/video.png differ
diff --git a/wp-includes/images/zip.png b/wp-includes/images/zip.png
new file mode 100644
index 0000000000..d1eaf1eec6
Binary files /dev/null and b/wp-includes/images/zip.png differ
diff --git a/wp-includes/js/swfupload/handlers.js b/wp-includes/js/swfupload/handlers.js
index e979e933bb..e3f8b12ef2 100644
--- a/wp-includes/js/swfupload/handlers.js
+++ b/wp-includes/js/swfupload/handlers.js
@@ -1,5 +1,6 @@
-function uploadLoadedMultimedia() {
-	jQuery("#html-upload-ui").empty();
+function uploadLoaded() {
+	jQuery("#html-upload-ui").remove();
+	jQuery("#flash-upload-ui").show();
 }
 
 function fileDialogStart() {
@@ -7,7 +8,7 @@ function fileDialogStart() {
 }
 
 // progress and success handlers for multimedia multi uploads
-function fileQueuedMultimedia(fileObj) {
+function fileQueued(fileObj) {
 	// Create a progress bar containing the filename
 	jQuery('#multimedia-items').append('<div id="multimedia-item-' + fileObj.id + '" class="multimedia-item"><span class="filename original">' + fileObj.name + '</span><div class="progress"><div class="bar"></div></div></div>');
 
@@ -15,12 +16,14 @@ function fileQueuedMultimedia(fileObj) {
 	jQuery('#insert-multimedia').attr('disabled', 'disabled');
 }
 
-function uploadProgressMultimedia(fileObj, bytesDone, bytesTotal) {
+function uploadStart(fileObj) { return true; }
+
+function uploadProgress(fileObj, bytesDone, bytesTotal) {
 	// Lengthen the progress bar
 	jQuery('#multimedia-item-' + fileObj.id + ' .bar').width(620*bytesDone/bytesTotal);
 }
 
-function uploadSuccessMultimedia(fileObj, serverData) {
+function uploadSuccess(fileObj, serverData) {
 	// if async-upload returned an error message, place it in the multimedia item div and return
 	if ( serverData.match('media-upload-error') ) {
 		jQuery('#multimedia-item-' + fileObj.id).html(serverData);
@@ -34,7 +37,7 @@ function uploadSuccessMultimedia(fileObj, serverData) {
 	jQuery('#multimedia-item-' + fileObj.id).append(serverData);
 
 	// Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename
-	jQuery('#multimedia-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail').prependTo('#multimedia-item-' + fileObj.id);
+	jQuery('#multimedia-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail toggle').prependTo('#multimedia-item-' + fileObj.id);
 
 	// Replace the original filename with the new (unique) one assigned during upload
 	jQuery('#multimedia-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#multimedia-item-' + fileObj.id + ' .filename.new'));
@@ -46,50 +49,24 @@ function uploadSuccessMultimedia(fileObj, serverData) {
 	jQuery('#multimedia-item-' + fileObj.id + ' a.toggle').bind('click', function(){jQuery(this).siblings('.slidetoggle').slideToggle(150);jQuery(this).parent().eq(0).children('.toggle').toggle();jQuery(this).siblings('a.toggle').focus();return false;});
 
 	// Bind AJAX to the new Delete button
-	jQuery('#multimedia-item-' + fileObj.id + ' a.delete').bind('click',function(){jQuery.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/[^0-9]/g,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});jQuery(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){jQuery(this).remove();});return false;});
+	jQuery('#multimedia-item-' + fileObj.id + ' a.delete').bind('click',function(){jQuery.ajax({url:'admin-ajax.php',type:'post',data:{id:this.id.replace(/[^0-9]/g,''),action:'delete-post',_ajax_nonce:this.href.replace(/^.*wpnonce=/,'')}});jQuery(this).parents(".multimedia-item").eq(0).slideToggle(300, function(){jQuery(this).remove();if(jQuery('.multimedia-item').length==0)jQuery('.insert-gallery').hide();});return false;});
 
 	// Open this item if it says to start open
 	jQuery('#multimedia-item-' + fileObj.id + ' .startopen')
 		.removeClass('startopen')
 		.slideToggle(500)
 		.parent().eq(0).children('.toggle').toggle();
+
+	jQuery('.insert-gallery').show();
 }
 
-function uploadCompleteMultimedia(fileObj) {
+function uploadComplete(fileObj) {
 	// If no more uploads queued, enable the submit button
 	if ( swfu.getStats().files_queued == 0 )
 		jQuery('#insert-multimedia').attr('disabled', '');
 }
 
 
-// progress and success handlers for single image upload
-
-function uploadLoadedImage() {
-	jQuery('#image-alt').attr('disabled', true);
-	jQuery('#image-url').attr('disabled', true);
-	jQuery('#image-title').attr('disabled', true);
-	jQuery('#image-add').attr('disabled', true);
-}
-
-function fileQueuedImage(fileObj) {
-	jQuery('#flash-upload-ui').append('<div id="image-progress"><p class="filename">' + fileObj.name + '</p><div class="progress"><div class="bar"></div></div></div>');
-}
-
-function uploadProgressImage(fileObj, bytesDone, bytesTotal) {
-	jQuery('#image-progress .bar').width(450*bytesDone/bytesTotal);
-}
-
-function uploadSuccessImage(fileObj, serverData) {
-	if ( serverData.match('media-upload-error') ) {
-		jQuery('#media-upload-error').replaceWith(serverData);
-		jQuery('#image-progress').replaceWith('');
-	}
-	else {
-		jQuery('#media-upload-error').replaceWith('');
-		jQuery('#flash-upload-ui').replaceWith(serverData);
-	}
-}
-
 // wp-specific error handlers
 
 // generic message
@@ -121,14 +98,6 @@ function fileQueueError(fileObj, error_code, message)  {
 	}
 }
 
-function fileQueued(fileObj) {
-	try {
-		var txtFileName = document.getElementById("txtFileName");
-		txtFileName.value = fileObj.name;
-	} catch (e) { }
-
-}
-
 function fileDialogComplete(num_files_queued) {
 	try {
 		if (num_files_queued > 0) {
@@ -139,171 +108,33 @@ function fileDialogComplete(num_files_queued) {
 	}
 }
 
-function uploadProgress(fileObj, bytesLoaded, bytesTotal) {
-
-	try {
-		var percent = Math.ceil((bytesLoaded / bytesTotal) * 100)
-
-		fileObj.id = "singlefile";	// This makes it so FileProgress only makes a single UI element, instead of one for each file
-		var progress = new FileProgress(fileObj, this.customSettings.progress_target);
-		progress.SetProgress(percent);
-		progress.SetStatus("Uploading...");
-	} catch (e) { }
-}
-
-function uploadSuccess(fileObj, server_data) {
-	try {
-		fileObj.id = "singlefile";	// This makes it so FileProgress only makes a single UI element, instead of one for each file
-		var progress = new FileProgress(fileObj, this.customSettings.progress_target);
-		progress.SetComplete();
-		progress.SetStatus("Complete.");
-		progress.ToggleCancel(false);
-		
-		if (server_data === " ") {
-			this.customSettings.upload_successful = false;
-		} else {
-			this.customSettings.upload_successful = true;
-			document.getElementById("hidFileID").value = server_data;
-		}
-		
-	} catch (e) { }
-}
-
-function uploadComplete(fileObj) {
-	try {
-		if (this.customSettings.upload_successful) {
-			document.getElementById("btnBrowse").disabled = "true";
-			uploadDone();
-		} else {
-			fileObj.id = "singlefile";	// This makes it so FileProgress only makes a single UI element, instead of one for each file
-			var progress = new FileProgress(fileObj, this.customSettings.progress_target);
-			progress.SetError();
-			progress.SetStatus("File rejected");
-			progress.ToggleCancel(false);
-			
-			var txtFileName = document.getElementById("txtFileName");
-			txtFileName.value = "";
-			//validateForm();
-
-			alert("There was a problem with the upload.\nThe server did not accept it.");
-		}
-	} catch (e) {  }
-}
-
 function uploadError(fileObj, error_code, message) {
-		
-		// first the file specific error
-		if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) {
-			wpFileError(fileObj, swfuploadL10n.missing_upload_url);
-		}
-		else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) {
-			wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
-		}
-		else {
-			wpFileError(fileObj, swfuploadL10n.default_error);
-		}
-		
-		// not sure if this is needed
-		fileObj.id = "singlefile";	// This makes it so FileProgress only makes a single UI element, instead of one for each file
-		var progress = new FileProgress(fileObj, this.customSettings.progress_target);
-		progress.SetError();
-		progress.ToggleCancel(false);
+alert(message);return;
+	// first the file specific error
+	if ( error_code == SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL ) {
+		wpFileError(fileObj, swfuploadL10n.missing_upload_url);
+	}
+	else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED ) {
+		wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
+	}
+	else {
+		wpFileError(fileObj, swfuploadL10n.default_error);
+	}
 
-		// now the general upload status
-		if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) {
-			wpQueueError(swfuploadL10n.http_error);
-		}
-		else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) {
-			wpQueueError(swfuploadL10n.upload_failed);
-		}
-		else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) {
-			wpQueueError(swfuploadL10n.io_error);
-		}
-		else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) {
-			wpQueueError(swfuploadL10n.security_error);
-		}
-		else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) {
-			wpQueueError(swfuploadL10n.security_error);
-		}
-}
-
-
-/* ********************************************************
- *  Utility for displaying the file upload information
- *  This is not part of SWFUpload, just part of the demo
- * ******************************************************** */
-function FileProgress(fileObj, target_id) {
-		this.file_progress_id = fileObj.id;
-
-		this.fileProgressElement = document.getElementById(this.file_progress_id);
-		if (!this.fileProgressElement) {
-			this.fileProgressElement = document.createElement("div");
-			this.fileProgressElement.className = "progressContainer";
-			this.fileProgressElement.id = this.file_progress_id;
-
-			var progressCancel = document.createElement("a");
-			progressCancel.className = "progressCancel";
-			progressCancel.href = "#";
-			progressCancel.style.visibility = "hidden";
-			progressCancel.appendChild(document.createTextNode(" "));
-
-			var progressText = document.createElement("div");
-			progressText.className = "progressName";
-			progressText.appendChild(document.createTextNode(fileObj.name));
-
-			var progressBar = document.createElement("div");
-			progressBar.className = "progressBarInProgress";
-
-			var progressStatus = document.createElement("div");
-			progressStatus.className = "progressBarStatus";
-			progressStatus.innerHTML = "&nbsp;";
-
-			this.fileProgressElement.appendChild(progressCancel);
-			this.fileProgressElement.appendChild(progressText);
-			this.fileProgressElement.appendChild(progressStatus);
-			this.fileProgressElement.appendChild(progressBar);
-
-			document.getElementById(target_id).appendChild(this.fileProgressElement);
-
-		}
-
-}
-FileProgress.prototype.SetStart = function() {
-		this.fileProgressElement.className = "progressContainer";
-		this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
-		this.fileProgressElement.childNodes[3].style.width = "";
-}
-
-FileProgress.prototype.SetProgress = function(percentage) {
-		this.fileProgressElement.className = "progressContainer green";
-		this.fileProgressElement.childNodes[3].className = "progressBarInProgress";
-		this.fileProgressElement.childNodes[3].style.width = percentage + "%";
-}
-FileProgress.prototype.SetComplete = function() {
-		this.fileProgressElement.className = "progressContainer blue";
-		this.fileProgressElement.childNodes[3].className = "progressBarComplete";
-		this.fileProgressElement.childNodes[3].style.width = "";
-
-
-}
-FileProgress.prototype.SetError = function() {
-		this.fileProgressElement.className = "progressContainer red";
-		this.fileProgressElement.childNodes[3].className = "progressBarError";
-		this.fileProgressElement.childNodes[3].style.width = "";
-}
-FileProgress.prototype.SetCancelled = function() {
-		this.fileProgressElement.className = "progressContainer";
-		this.fileProgressElement.childNodes[3].className = "progressBarError";
-		this.fileProgressElement.childNodes[3].style.width = "";
-}
-FileProgress.prototype.SetStatus = function(status) {
-		this.fileProgressElement.childNodes[2].innerHTML = status;
-}
-
-FileProgress.prototype.ToggleCancel = function(show, upload_obj) {
-		this.fileProgressElement.childNodes[0].style.visibility = show ? "visible" : "hidden";
-		if (upload_obj) {
-			var file_id = this.file_progress_id;
-			this.fileProgressElement.childNodes[0].onclick = function() { upload_obj.cancelUpload(file_id); return false; };
-		}
+	// now the general upload status
+	if ( error_code == SWFUpload.UPLOAD_ERROR.HTTP_ERROR ) {
+		wpQueueError(swfuploadL10n.http_error);
+	}
+	else if ( error_code == SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED ) {
+		wpQueueError(swfuploadL10n.upload_failed);
+	}
+	else if ( error_code == SWFUpload.UPLOAD_ERROR.IO_ERROR ) {
+		wpQueueError(swfuploadL10n.io_error);
+	}
+	else if ( error_code == SWFUpload.UPLOAD_ERROR.SECURITY_ERROR ) {
+		wpQueueError(swfuploadL10n.security_error);
+	}
+	else if ( error_code == SWFUpload.UPLOAD_ERROR.FILE_CANCELLED ) {
+		wpQueueError(swfuploadL10n.security_error);
+	}
 }
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 7db43be898..878a808d69 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -85,7 +85,7 @@ function get_image_tag($id, $alt, $title, $align, $rel = false, $size='medium')
 	list( $img_src, $width, $height ) = image_downsize($id, $size);
 	$hwstring = image_hwstring($width, $height);
 
-	$html = '<img src="'.attribute_escape($img_src).'" alt="'.attribute_escape($alt).'" title="'.attribute_escape($title).'"'.$hwstring.' class="align-'.attribute_escape($align).' size-'.attribute_escape($size).' attachment wp-att-'.attribute_escape($id).'" />';
+	$html = '<img src="'.attribute_escape($img_src).'" alt="'.attribute_escape($alt).'" title="'.attribute_escape($title).'" '.$hwstring.'class="align-'.attribute_escape($align).' size-'.attribute_escape($size).' attachment wp-att-'.attribute_escape($id).'" />';
 
 	$html = apply_filters( 'image_send_to_editor', $html, $id, $alt, $title, $align, $url );
 
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 64c9899d00..98f174fc64 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -362,8 +362,8 @@ function walk_page_dropdown_tree() {
 // Attachments
 //
 
-function the_attachment_link($id = 0, $fullsize = false, $max_dims = false) {
-	echo get_the_attachment_link($id, $fullsize, $max_dims);
+function the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
+	echo get_the_attachment_link($id, $fullsize, $max_dims, $permalink);
 }
 
 function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
diff --git a/wp-includes/post.php b/wp-includes/post.php
index ff4d97fa85..b513d1fb85 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -2302,41 +2302,55 @@ function wp_attachment_is_image( $post_id = 0 ) {
  */
 function wp_mime_type_icon( $mime = 0 ) {
 	$post_id = 0;
-	if ( is_numeric($mime) ) {
-		$mime = (int) $mime;
-		if ( !$post =& get_post( $mime ) )
-			return false;
-		$post_id = (int) $post->ID;
-		$mime = $post->post_mime_type;
-	}
 
-	if ( empty($mime) )
-		return false;
+	$icon = wp_cache_get('mime_type_icon');
+	
+	if ( empty($icon) ) {
+		if ( is_numeric($mime) ) {
+			$mime = (int) $mime;
+			if ( !$post =& get_post( $mime ) )
+				return false;
+			$post_id = (int) $post->ID;
+			$mime = $post->post_mime_type;
+			$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid);
+		}
+	
+		$types = array();
+	
+		if ( !empty($ext) )
+			$types[] = $ext;
+	
+		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
+		$icon_dir_uri = apply_filters( 'icon_dir_uri', get_template_directory_uri() . '/images' );
+		$image_dir = apply_filters( 'image_dir', ABSPATH . WPINC . '/images' );
+		$image_dir_uri = apply_filters( 'image_dir', get_option('siteurl') . '/' . WPINC . '/images' );
+		$dirs = array($icon_dir => $icon_dir_uri, $image_dir => $image_dir_uri);
+	
+	
+		if ( ! empty($mime) ) {
+			$types[] = substr($mime, 0, strpos($mime, '/'));
+			$types[] = substr($mime, strpos($mime, '/') + 1);
+			$types[] = str_replace('/', '_', $mime);
+		}
+	
+		$types[] = 'default';
+	
+		$exts = array('png', 'gif', 'jpg');
 
-	$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-	$icon_dir_uri = apply_filters( 'icon_dir_uri', get_template_directory_uri() . '/images' );
-
-	$types = array(
-		substr($mime, 0, strpos($mime, '/')),
-		substr($mime, strpos($mime, '/') + 1),
-		str_replace('/', '_', $mime)
-	);
-
-	$exts = array('jpg', 'gif', 'png');
-
-	$src = false;
-
-	foreach ( $types as $type ) {
-		foreach ( $exts as $ext ) {
-			$src_file = "$icon_dir/$type.$ext";
-			if ( file_exists($src_file) ) {
-				$src = "$icon_dir_uri/$type.$ext";
-				break 2;
+		foreach ( $types as $type ) {
+			foreach ( $exts as $ext ) {
+				foreach ( $dirs as $dir => $uri ) {
+					$src_file = "$dir/$type.$ext";
+					if ( file_exists($src_file) ) {
+						$icon = "$uri/$type.$ext";
+						break 3;
+					}
+				}
 			}
 		}
 	}
 
-	return apply_filters( 'wp_mime_type_icon', $src, $mime, $post_id ); // Last arg is 0 if function pass mime type.
+	return apply_filters( 'wp_mime_type_icon', $icon, $mime, $post_id ); // Last arg is 0 if function pass mime type.
 }
 
 /**
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index e7a1421820..7978a98ab2 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -94,7 +94,7 @@ class WP_Scripts {
 		$this->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2.0.2');
 		$this->add( 'swfupload-degrade', '/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js', array('swfupload'), '2.0.2');
 		$this->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.0.2');
-		$this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080216');
+		$this->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.0.2-20080220');
 		// these error messages came from the sample swfupload js, they might need changing.
 		$this->localize( 'swfupload-handlers', 'swfuploadL10n', array(
 				'queue_limit_exceeded' => 'You have attempted to queue too many files.',