diff -x .svn -aruN 2.8.5.src/readme.html 2.8.6.src/readme.html
--- 2.8.5.src/readme.html	2009-10-20 11:46:44.000000000 -0500
+++ 2.8.6.src/readme.html	2009-11-11 17:22:21.000000000 -0600
@@ -8,7 +8,7 @@
 <body>
 <h1 id="logo" style="text-align: center">
 	<img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
-	<br /> Version 2.8.5
+	<br /> Version 2.8.6
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
@@ -29,7 +29,7 @@
 
 <h1>Upgrading</h1>
 <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
-<h2>Upgrading from any previous WordPress to 2.8.5:</h2>
+<h2>Upgrading from any previous WordPress to 2.8.6:</h2>
 <ol>
 	<li>Delete your old WP files, saving ones you've modified.</li>
 	<li>Upload the new files.</li>
diff -x .svn -aruN 2.8.5.src/wp-admin/press-this.php 2.8.6.src/wp-admin/press-this.php
--- 2.8.5.src/wp-admin/press-this.php	2009-05-18 11:00:10.000000000 -0500
+++ 2.8.6.src/wp-admin/press-this.php	2009-11-11 20:49:50.000000000 -0600
@@ -91,8 +91,8 @@
 }
 
 // Set Variables
-$title = isset($_GET['t']) ? esc_html(aposfix(stripslashes($_GET['t']))) : '';
-$selection = isset($_GET['s']) ? trim( aposfix( stripslashes($_GET['s']) ) ) : '';
+$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';
+$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';
 if ( ! empty($selection) ) {
 	$selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
 	$selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
@@ -117,7 +117,7 @@
 		<div class="postbox">
 		<h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
 		<div class="inside">
-			<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo format_to_edit($selection, true); ?></textarea>
+			<textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo wp_htmledit_pre( $selection ); ?></textarea>
 			<p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
 		</div>
 		</div>
@@ -548,8 +548,8 @@
 			<div id="quicktags"></div>
 			<div class="editor-container">
 				<textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
-					<?php if ($selection) echo wp_richedit_pre(htmlspecialchars_decode($selection)); ?>
-					<?php if ($url) { echo '<p>'; if($selection) _e('via '); echo "<a href='$url'>$title</a>."; echo '</p>'; } ?>
+					<?php if ($selection) echo wp_richedit_pre( $selection ); ?>
+					<?php if ($url) { echo '<p>'; if($selection) _e('via '); printf( "<a href='%s'>%s</a>.", esc_url( $url ), esc_html( $title ) ); echo '</p>'; } ?>
 				</textarea>
 			</div>
 		</div>
diff -x .svn -aruN 2.8.5.src/wp-content/plugins/akismet/akismet.php 2.8.6.src/wp-content/plugins/akismet/akismet.php
--- 2.8.5.src/wp-content/plugins/akismet/akismet.php	2009-10-18 23:31:48.000000000 -0500
+++ 2.8.6.src/wp-content/plugins/akismet/akismet.php	2009-10-21 18:48:39.000000000 -0500
@@ -315,6 +315,10 @@
 
 // Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
 function akismet_server_connectivity_ok() {
+	// skip the check on WPMU because the status page is hidden
+	global $wpcom_api_key;
+	if ( $wpcom_api_key )
+		return true;
 	$servers = akismet_get_server_connectivity();
 	return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
 }
@@ -403,7 +407,8 @@
 // filter handler used to return a spam result to pre_comment_approved
 function akismet_result_spam( $approved ) {
 	// bump the counter here instead of when the filter is added to reduce the possibility of overcounting
-	update_option( 'akismet_spam_count', get_option('akismet_spam_count') + 1 );
+	if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+		update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
 	return 'spam';
 }
 
@@ -442,7 +447,8 @@
 		
 		if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' ) {
 			// akismet_result_spam() won't be called so bump the counter here
-			update_option( 'akismet_spam_count', get_option('akismet_spam_count') + 1 );
+			if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+				update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
 			die;
 		}
 	}
diff -x .svn -aruN 2.8.5.src/wp-content/plugins/akismet/readme.txt 2.8.6.src/wp-content/plugins/akismet/readme.txt
--- 2.8.5.src/wp-content/plugins/akismet/readme.txt	2009-09-09 05:31:19.000000000 -0500
+++ 2.8.6.src/wp-content/plugins/akismet/readme.txt	2009-11-06 20:07:39.000000000 -0600
@@ -1,8 +1,8 @@
 === Akismet ===
-Contributors: matt, ryan, andy, mdawaffe, tellyworth
+Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic
 Tags: akismet, comments, spam
 Requires at least: 2.0
-Tested up to: 2.8.4
+Tested up to: 2.8.5
 
 Akismet checks your comments against the Akismet web service to see if they look like spam or not.
 
@@ -28,6 +28,8 @@
 = 2.2.7 =
 
 * Add a new AKISMET_VERSION constant
+* Reduce the possibility of over-counting spam when another spam filter plugin is in use
+* Disable the connectivity check when the API key is hard-coded for WPMU
 
 = 2.2.6 =
 
diff -x .svn -aruN 2.8.5.src/wp-includes/formatting.php 2.8.6.src/wp-includes/formatting.php
--- 2.8.5.src/wp-includes/formatting.php	2009-10-20 13:54:27.000000000 -0500
+++ 2.8.6.src/wp-includes/formatting.php	2009-11-11 17:09:50.000000000 -0600
@@ -605,6 +605,39 @@
 	$filename = str_replace($special_chars, '', $filename);
 	$filename = preg_replace('/[\s-]+/', '-', $filename);
 	$filename = trim($filename, '.-_');
+
+	// Split the filename into a base and extension[s]
+	$parts = explode('.', $filename);
+
+	// Return if only one extension
+	if ( count($parts) <= 2 )
+		return apply_filters('sanitize_file_name', $filename, $filename_raw);
+
+	// Process multiple extensions
+	$filename = array_shift($parts);
+	$extension = array_pop($parts);
+	$mimes = get_allowed_mime_types();
+
+	// Loop over any intermediate extensions.  Munge them with a trailing underscore if they are a 2 - 5 character
+	// long alpha string not in the extension whitelist.
+	foreach ( (array) $parts as $part) {
+		$filename .= '.' . $part;
+		
+		if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+			$allowed = false;
+			foreach ( $mimes as $ext_preg => $mime_match ) {
+				$ext_preg = '!(^' . $ext_preg . ')$!i';
+				if ( preg_match( $ext_preg, $part ) ) {
+					$allowed = true;
+					break;
+				}
+			}
+			if ( !$allowed )
+				$filename .= '_';
+		}
+	}
+	$filename .= '.' . $extension;
+
 	return apply_filters('sanitize_file_name', $filename, $filename_raw);
 }
 
diff -x .svn -aruN 2.8.5.src/wp-includes/functions.php 2.8.6.src/wp-includes/functions.php
--- 2.8.5.src/wp-includes/functions.php	2009-07-01 12:59:11.000000000 -0500
+++ 2.8.6.src/wp-includes/functions.php	2009-11-11 23:21:01.000000000 -0600
@@ -2226,8 +2226,36 @@
  * @return array Values with extension first and mime type.
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-	// Accepted MIME types are set here as PCRE unless provided.
-	$mimes = ( is_array( $mimes ) ) ? $mimes : apply_filters( 'upload_mimes', array(
+	if ( empty($mimes) )
+		$mimes = get_allowed_mime_types();
+	$type = false;
+	$ext = false;
+
+	foreach ( $mimes as $ext_preg => $mime_match ) {
+		$ext_preg = '!\.(' . $ext_preg . ')$!i';
+		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
+			$type = $mime_match;
+			$ext = $ext_matches[1];
+			break;
+		}
+	}
+
+	return compact( 'ext', 'type' );
+}
+
+/**
+ * Retrieve list of allowed mime types and file extensions.
+ *
+ * @since 2.8.6
+ *
+ * @return array Array of mime types keyed by the file extension regex corresponding to those types.
+ */
+function get_allowed_mime_types() {
+	static $mimes = false;
+
+	if ( !$mimes ) {
+		// Accepted MIME types are set here as PCRE unless provided.
+		$mimes = apply_filters( 'upload_mimes', array(
 		'jpg|jpeg|jpe' => 'image/jpeg',
 		'gif' => 'image/gif',
 		'png' => 'image/png',
@@ -2273,22 +2301,10 @@
 		'odc' => 'application/vnd.oasis.opendocument.chart',
 		'odb' => 'application/vnd.oasis.opendocument.database',
 		'odf' => 'application/vnd.oasis.opendocument.formula',
-		)
-	);
-
-	$type = false;
-	$ext = false;
-
-	foreach ( $mimes as $ext_preg => $mime_match ) {
-		$ext_preg = '!\.(' . $ext_preg . ')$!i';
-		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
-			$type = $mime_match;
-			$ext = $ext_matches[1];
-			break;
-		}
+		) );
 	}
 
-	return compact( 'ext', 'type' );
+	return $mimes;
 }
 
 /**
diff -x .svn -aruN 2.8.5.src/wp-includes/js/swfupload/plugins/swfupload.speed.js 2.8.6.src/wp-includes/js/swfupload/plugins/swfupload.speed.js
--- 2.8.5.src/wp-includes/js/swfupload/plugins/swfupload.speed.js	2009-05-17 07:29:35.000000000 -0500
+++ 2.8.6.src/wp-includes/js/swfupload/plugins/swfupload.speed.js	2009-10-21 10:17:34.000000000 -0500
@@ -1,342 +1,342 @@
-/*
-	Speed Plug-in
-	
-	Features:
-		*Adds several properties to the 'file' object indicated upload speed, time left, upload time, etc.
-			- currentSpeed -- String indicating the upload speed, bytes per second
-			- averageSpeed -- Overall average upload speed, bytes per second
-			- movingAverageSpeed -- Speed over averaged over the last several measurements, bytes per second
-			- timeRemaining -- Estimated remaining upload time in seconds
-			- timeElapsed -- Number of seconds passed for this upload
-			- percentUploaded -- Percentage of the file uploaded (0 to 100)
-			- sizeUploaded -- Formatted size uploaded so far, bytes
-		
-		*Adds setting 'moving_average_history_size' for defining the window size used to calculate the moving average speed.
-		
-		*Adds several Formatting functions for formatting that values provided on the file object.
-			- SWFUpload.speed.formatBPS(bps) -- outputs string formatted in the best units (Gbps, Mbps, Kbps, bps)
-			- SWFUpload.speed.formatTime(seconds) -- outputs string formatted in the best units (x Hr y M z S)
-			- SWFUpload.speed.formatSize(bytes) -- outputs string formatted in the best units (w GB x MB y KB z B )
-			- SWFUpload.speed.formatPercent(percent) -- outputs string formatted with a percent sign (x.xx %)
-			- SWFUpload.speed.formatUnits(baseNumber, divisionArray, unitLabelArray, fractionalBoolean)
-				- Formats a number using the division array to determine how to apply the labels in the Label Array
-				- factionalBoolean indicates whether the number should be returned as a single fractional number with a unit (speed)
-				    or as several numbers labeled with units (time)
-	*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-	SWFUpload.speed = {};
-	
-	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
-			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
-			}
-			
-			this.ensureDefault = function (settingName, defaultValue) {
-				this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-			};
-
-			// List used to keep the speed stats for the files we are tracking
-			this.fileSpeedStats = {};
-			this.speedSettings = {};
-
-			this.ensureDefault("moving_average_history_size", "10");
-			
-			this.speedSettings.user_file_queued_handler = this.settings.file_queued_handler;
-			this.speedSettings.user_file_queue_error_handler = this.settings.file_queue_error_handler;
-			this.speedSettings.user_upload_start_handler = this.settings.upload_start_handler;
-			this.speedSettings.user_upload_error_handler = this.settings.upload_error_handler;
-			this.speedSettings.user_upload_progress_handler = this.settings.upload_progress_handler;
-			this.speedSettings.user_upload_success_handler = this.settings.upload_success_handler;
-			this.speedSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
-			
-			this.settings.file_queued_handler = SWFUpload.speed.fileQueuedHandler;
-			this.settings.file_queue_error_handler = SWFUpload.speed.fileQueueErrorHandler;
-			this.settings.upload_start_handler = SWFUpload.speed.uploadStartHandler;
-			this.settings.upload_error_handler = SWFUpload.speed.uploadErrorHandler;
-			this.settings.upload_progress_handler = SWFUpload.speed.uploadProgressHandler;
-			this.settings.upload_success_handler = SWFUpload.speed.uploadSuccessHandler;
-			this.settings.upload_complete_handler = SWFUpload.speed.uploadCompleteHandler;
-			
-			delete this.ensureDefault;
-		};
-	})(SWFUpload.prototype.initSettings);
-
-	
-	SWFUpload.speed.fileQueuedHandler = function (file) {
-		if (typeof this.speedSettings.user_file_queued_handler === "function") {
-			file = SWFUpload.speed.extendFile(file);
-			
-			return this.speedSettings.user_file_queued_handler.call(this, file);
-		}
-	};
-	
-	SWFUpload.speed.fileQueueErrorHandler = function (file, errorCode, message) {
-		if (typeof this.speedSettings.user_file_queue_error_handler === "function") {
-			file = SWFUpload.speed.extendFile(file);
-			
-			return this.speedSettings.user_file_queue_error_handler.call(this, file, errorCode, message);
-		}
-	};
-
-	SWFUpload.speed.uploadStartHandler = function (file) {
-		if (typeof this.speedSettings.user_upload_start_handler === "function") {
-			file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-			return this.speedSettings.user_upload_start_handler.call(this, file);
-		}
-	};
-	
-	SWFUpload.speed.uploadErrorHandler = function (file, errorCode, message) {
-		file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-		SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
-
-		if (typeof this.speedSettings.user_upload_error_handler === "function") {
-			return this.speedSettings.user_upload_error_handler.call(this, file, errorCode, message);
-		}
-	};
-	SWFUpload.speed.uploadProgressHandler = function (file, bytesComplete, bytesTotal) {
-		this.updateTracking(file, bytesComplete);
-		file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-
-		if (typeof this.speedSettings.user_upload_progress_handler === "function") {
-			return this.speedSettings.user_upload_progress_handler.call(this, file, bytesComplete, bytesTotal);
-		}
-	};
-	
-	SWFUpload.speed.uploadSuccessHandler = function (file, serverData) {
-		if (typeof this.speedSettings.user_upload_success_handler === "function") {
-			file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-			return this.speedSettings.user_upload_success_handler.call(this, file, serverData);
-		}
-	};
-	SWFUpload.speed.uploadCompleteHandler = function (file) {
-		file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-		SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
-
-		if (typeof this.speedSettings.user_upload_complete_handler === "function") {
-			return this.speedSettings.user_upload_complete_handler.call(this, file);
-		}
-	};
-	
-	// Private: extends the file object with the speed plugin values
-	SWFUpload.speed.extendFile = function (file, trackingList) {
-		var tracking;
-		
-		if (trackingList) {
-			tracking = trackingList[file.id];
-		}
-		
-		if (tracking) {
-			file.currentSpeed = tracking.currentSpeed;
-			file.averageSpeed = tracking.averageSpeed;
-			file.movingAverageSpeed = tracking.movingAverageSpeed;
-			file.timeRemaining = tracking.timeRemaining;
-			file.timeElapsed = tracking.timeElapsed;
-			file.percentUploaded = tracking.percentUploaded;
-			file.sizeUploaded = tracking.bytesUploaded;
-
-		} else {
-			file.currentSpeed = 0;
-			file.averageSpeed = 0;
-			file.movingAverageSpeed = 0;
-			file.timeRemaining = 0;
-			file.timeElapsed = 0;
-			file.percentUploaded = 0;
-			file.sizeUploaded = 0;
-		}
-		
-		return file;
-	};
-	
-	// Private: Updates the speed tracking object, or creates it if necessary
-	SWFUpload.prototype.updateTracking = function (file, bytesUploaded) {
-		var tracking = this.fileSpeedStats[file.id];
-		if (!tracking) {
-			this.fileSpeedStats[file.id] = tracking = {};
-		}
-		
-		// Sanity check inputs
-		bytesUploaded = bytesUploaded || tracking.bytesUploaded || 0;
-		if (bytesUploaded < 0) {
-			bytesUploaded = 0;
-		}
-		if (bytesUploaded > file.size) {
-			bytesUploaded = file.size;
-		}
-		
-		var tickTime = (new Date()).getTime();
-		if (!tracking.startTime) {
-			tracking.startTime = (new Date()).getTime();
-			tracking.lastTime = tracking.startTime;
-			tracking.currentSpeed = 0;
-			tracking.averageSpeed = 0;
-			tracking.movingAverageSpeed = 0;
-			tracking.movingAverageHistory = [];
-			tracking.timeRemaining = 0;
-			tracking.timeElapsed = 0;
-			tracking.percentUploaded = bytesUploaded / file.size;
-			tracking.bytesUploaded = bytesUploaded;
-		} else if (tracking.startTime > tickTime) {
-			this.debug("When backwards in time");
-		} else {
-			// Get time and deltas
-			var now = (new Date()).getTime();
-			var lastTime = tracking.lastTime;
-			var deltaTime = now - lastTime;
-			var deltaBytes = bytesUploaded - tracking.bytesUploaded;
-			
-			if (deltaBytes === 0 || deltaTime === 0) {
-				return tracking;
-			}
-			
-			// Update tracking object
-			tracking.lastTime = now;
-			tracking.bytesUploaded = bytesUploaded;
-			
-			// Calculate speeds
-			tracking.currentSpeed = (deltaBytes * 8 ) / (deltaTime / 1000);
-			tracking.averageSpeed = (tracking.bytesUploaded * 8) / ((now - tracking.startTime) / 1000);
-
-			// Calculate moving average
-			tracking.movingAverageHistory.push(tracking.currentSpeed);
-			if (tracking.movingAverageHistory.length > this.settings.moving_average_history_size) {
-				tracking.movingAverageHistory.shift();
-			}
-			
-			tracking.movingAverageSpeed = SWFUpload.speed.calculateMovingAverage(tracking.movingAverageHistory);
-			
-			// Update times
-			tracking.timeRemaining = (file.size - tracking.bytesUploaded) * 8 / tracking.movingAverageSpeed;
-			tracking.timeElapsed = (now - tracking.startTime) / 1000;
-			
-			// Update percent
-			tracking.percentUploaded = (tracking.bytesUploaded / file.size * 100);
-		}
-		
-		return tracking;
-	};
-	SWFUpload.speed.removeTracking = function (file, trackingList) {
-		try {
-			trackingList[file.id] = null;
-			delete trackingList[file.id];
-		} catch (ex) {
-		}
-	};
-	
-	SWFUpload.speed.formatUnits = function (baseNumber, unitDivisors, unitLabels, singleFractional) {
-		var i, unit, unitDivisor, unitLabel;
-
-		if (baseNumber === 0) {
-			return "0 " + unitLabels[unitLabels.length - 1];
-		}
-		
-		if (singleFractional) {
-			unit = baseNumber;
-			unitLabel = unitLabels.length >= unitDivisors.length ? unitLabels[unitDivisors.length - 1] : "";
-			for (i = 0; i < unitDivisors.length; i++) {
-				if (baseNumber >= unitDivisors[i]) {
-					unit = (baseNumber / unitDivisors[i]).toFixed(2);
-					unitLabel = unitLabels.length >= i ? " " + unitLabels[i] : "";
-					break;
-				}
-			}
-			
-			return unit + unitLabel;
-		} else {
-			var formattedStrings = [];
-			var remainder = baseNumber;
-			
-			for (i = 0; i < unitDivisors.length; i++) {
-				unitDivisor = unitDivisors[i];
-				unitLabel = unitLabels.length > i ? " " + unitLabels[i] : "";
-				
-				unit = remainder / unitDivisor;
-				if (i < unitDivisors.length -1) {
-					unit = Math.floor(unit);
-				} else {
-					unit = unit.toFixed(2);
-				}
-				if (unit > 0) {
-					remainder = remainder % unitDivisor;
-					
-					formattedStrings.push(unit + unitLabel);
-				}
-			}
-			
-			return formattedStrings.join(" ");
-		}
-	};
-	
-	SWFUpload.speed.formatBPS = function (baseNumber) {
-		var bpsUnits = [1073741824, 1048576, 1024, 1], bpsUnitLabels = ["Gbps", "Mbps", "Kbps", "bps"];
-		return SWFUpload.speed.formatUnits(baseNumber, bpsUnits, bpsUnitLabels, true);
-	
-	};
-	SWFUpload.speed.formatTime = function (baseNumber) {
-		var timeUnits = [86400, 3600, 60, 1], timeUnitLabels = ["d", "h", "m", "s"];
-		return SWFUpload.speed.formatUnits(baseNumber, timeUnits, timeUnitLabels, false);
-	
-	};
-	SWFUpload.speed.formatBytes = function (baseNumber) {
-		var sizeUnits = [1073741824, 1048576, 1024, 1], sizeUnitLabels = ["GB", "MB", "KB", "bytes"];
-		return SWFUpload.speed.formatUnits(baseNumber, sizeUnits, sizeUnitLabels, true);
-	
-	};
-	SWFUpload.speed.formatPercent = function (baseNumber) {
-		return baseNumber.toFixed(2) + " %";
-	};
-	
-	SWFUpload.speed.calculateMovingAverage = function (history) {
-		var vals = [], size, sum = 0.0, mean = 0.0, varianceTemp = 0.0, variance = 0.0, standardDev = 0.0;
-		var i;
-		var mSum = 0, mCount = 0;
-		
-		size = history.length;
-		
-		// Check for sufficient data
-		if (size >= 8) {
-			// Clone the array and Calculate sum of the values 
-			for (i = 0; i < size; i++) {
-				vals[i] = history[i];
-				sum += vals[i];
-			}
-
-			mean = sum / size;
-
-			// Calculate variance for the set
-			for (i = 0; i < size; i++) {
-				varianceTemp += Math.pow((vals[i] - mean), 2);
-			}
-
-			variance = varianceTemp / size;
-			standardDev = Math.sqrt(variance);
-			
-			//Standardize the Data
-			for (i = 0; i < size; i++) {
-				vals[i] = (vals[i] - mean) / standardDev;
-			}
-
-			// Calculate the average excluding outliers
-			var deviationRange = 2.0;
-			for (i = 0; i < size; i++) {
-				
-				if (vals[i] <= deviationRange && vals[i] >= -deviationRange) {
-					mCount++;
-					mSum += history[i];
-				}
-			}
-			
-		} else {
-			// Calculate the average (not enough data points to remove outliers)
-			mCount = size;
-			for (i = 0; i < size; i++) {
-				mSum += history[i];
-			}
-		}
-
-		return mSum / mCount;
-	};
-	
+/*
+	Speed Plug-in
+	
+	Features:
+		*Adds several properties to the 'file' object indicated upload speed, time left, upload time, etc.
+			- currentSpeed -- String indicating the upload speed, bytes per second
+			- averageSpeed -- Overall average upload speed, bytes per second
+			- movingAverageSpeed -- Speed over averaged over the last several measurements, bytes per second
+			- timeRemaining -- Estimated remaining upload time in seconds
+			- timeElapsed -- Number of seconds passed for this upload
+			- percentUploaded -- Percentage of the file uploaded (0 to 100)
+			- sizeUploaded -- Formatted size uploaded so far, bytes
+		
+		*Adds setting 'moving_average_history_size' for defining the window size used to calculate the moving average speed.
+		
+		*Adds several Formatting functions for formatting that values provided on the file object.
+			- SWFUpload.speed.formatBPS(bps) -- outputs string formatted in the best units (Gbps, Mbps, Kbps, bps)
+			- SWFUpload.speed.formatTime(seconds) -- outputs string formatted in the best units (x Hr y M z S)
+			- SWFUpload.speed.formatSize(bytes) -- outputs string formatted in the best units (w GB x MB y KB z B )
+			- SWFUpload.speed.formatPercent(percent) -- outputs string formatted with a percent sign (x.xx %)
+			- SWFUpload.speed.formatUnits(baseNumber, divisionArray, unitLabelArray, fractionalBoolean)
+				- Formats a number using the division array to determine how to apply the labels in the Label Array
+				- factionalBoolean indicates whether the number should be returned as a single fractional number with a unit (speed)
+				    or as several numbers labeled with units (time)
+	*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.speed = {};
+	
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+			
+			this.ensureDefault = function (settingName, defaultValue) {
+				this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+			};
+
+			// List used to keep the speed stats for the files we are tracking
+			this.fileSpeedStats = {};
+			this.speedSettings = {};
+
+			this.ensureDefault("moving_average_history_size", "10");
+			
+			this.speedSettings.user_file_queued_handler = this.settings.file_queued_handler;
+			this.speedSettings.user_file_queue_error_handler = this.settings.file_queue_error_handler;
+			this.speedSettings.user_upload_start_handler = this.settings.upload_start_handler;
+			this.speedSettings.user_upload_error_handler = this.settings.upload_error_handler;
+			this.speedSettings.user_upload_progress_handler = this.settings.upload_progress_handler;
+			this.speedSettings.user_upload_success_handler = this.settings.upload_success_handler;
+			this.speedSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			
+			this.settings.file_queued_handler = SWFUpload.speed.fileQueuedHandler;
+			this.settings.file_queue_error_handler = SWFUpload.speed.fileQueueErrorHandler;
+			this.settings.upload_start_handler = SWFUpload.speed.uploadStartHandler;
+			this.settings.upload_error_handler = SWFUpload.speed.uploadErrorHandler;
+			this.settings.upload_progress_handler = SWFUpload.speed.uploadProgressHandler;
+			this.settings.upload_success_handler = SWFUpload.speed.uploadSuccessHandler;
+			this.settings.upload_complete_handler = SWFUpload.speed.uploadCompleteHandler;
+			
+			delete this.ensureDefault;
+		};
+	})(SWFUpload.prototype.initSettings);
+
+	
+	SWFUpload.speed.fileQueuedHandler = function (file) {
+		if (typeof this.speedSettings.user_file_queued_handler === "function") {
+			file = SWFUpload.speed.extendFile(file);
+			
+			return this.speedSettings.user_file_queued_handler.call(this, file);
+		}
+	};
+	
+	SWFUpload.speed.fileQueueErrorHandler = function (file, errorCode, message) {
+		if (typeof this.speedSettings.user_file_queue_error_handler === "function") {
+			file = SWFUpload.speed.extendFile(file);
+			
+			return this.speedSettings.user_file_queue_error_handler.call(this, file, errorCode, message);
+		}
+	};
+
+	SWFUpload.speed.uploadStartHandler = function (file) {
+		if (typeof this.speedSettings.user_upload_start_handler === "function") {
+			file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
+			return this.speedSettings.user_upload_start_handler.call(this, file);
+		}
+	};
+	
+	SWFUpload.speed.uploadErrorHandler = function (file, errorCode, message) {
+		file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
+		SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
+
+		if (typeof this.speedSettings.user_upload_error_handler === "function") {
+			return this.speedSettings.user_upload_error_handler.call(this, file, errorCode, message);
+		}
+	};
+	SWFUpload.speed.uploadProgressHandler = function (file, bytesComplete, bytesTotal) {
+		this.updateTracking(file, bytesComplete);
+		file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
+
+		if (typeof this.speedSettings.user_upload_progress_handler === "function") {
+			return this.speedSettings.user_upload_progress_handler.call(this, file, bytesComplete, bytesTotal);
+		}
+	};
+	
+	SWFUpload.speed.uploadSuccessHandler = function (file, serverData) {
+		if (typeof this.speedSettings.user_upload_success_handler === "function") {
+			file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
+			return this.speedSettings.user_upload_success_handler.call(this, file, serverData);
+		}
+	};
+	SWFUpload.speed.uploadCompleteHandler = function (file) {
+		file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
+		SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
+
+		if (typeof this.speedSettings.user_upload_complete_handler === "function") {
+			return this.speedSettings.user_upload_complete_handler.call(this, file);
+		}
+	};
+	
+	// Private: extends the file object with the speed plugin values
+	SWFUpload.speed.extendFile = function (file, trackingList) {
+		var tracking;
+		
+		if (trackingList) {
+			tracking = trackingList[file.id];
+		}
+		
+		if (tracking) {
+			file.currentSpeed = tracking.currentSpeed;
+			file.averageSpeed = tracking.averageSpeed;
+			file.movingAverageSpeed = tracking.movingAverageSpeed;
+			file.timeRemaining = tracking.timeRemaining;
+			file.timeElapsed = tracking.timeElapsed;
+			file.percentUploaded = tracking.percentUploaded;
+			file.sizeUploaded = tracking.bytesUploaded;
+
+		} else {
+			file.currentSpeed = 0;
+			file.averageSpeed = 0;
+			file.movingAverageSpeed = 0;
+			file.timeRemaining = 0;
+			file.timeElapsed = 0;
+			file.percentUploaded = 0;
+			file.sizeUploaded = 0;
+		}
+		
+		return file;
+	};
+	
+	// Private: Updates the speed tracking object, or creates it if necessary
+	SWFUpload.prototype.updateTracking = function (file, bytesUploaded) {
+		var tracking = this.fileSpeedStats[file.id];
+		if (!tracking) {
+			this.fileSpeedStats[file.id] = tracking = {};
+		}
+		
+		// Sanity check inputs
+		bytesUploaded = bytesUploaded || tracking.bytesUploaded || 0;
+		if (bytesUploaded < 0) {
+			bytesUploaded = 0;
+		}
+		if (bytesUploaded > file.size) {
+			bytesUploaded = file.size;
+		}
+		
+		var tickTime = (new Date()).getTime();
+		if (!tracking.startTime) {
+			tracking.startTime = (new Date()).getTime();
+			tracking.lastTime = tracking.startTime;
+			tracking.currentSpeed = 0;
+			tracking.averageSpeed = 0;
+			tracking.movingAverageSpeed = 0;
+			tracking.movingAverageHistory = [];
+			tracking.timeRemaining = 0;
+			tracking.timeElapsed = 0;
+			tracking.percentUploaded = bytesUploaded / file.size;
+			tracking.bytesUploaded = bytesUploaded;
+		} else if (tracking.startTime > tickTime) {
+			this.debug("When backwards in time");
+		} else {
+			// Get time and deltas
+			var now = (new Date()).getTime();
+			var lastTime = tracking.lastTime;
+			var deltaTime = now - lastTime;
+			var deltaBytes = bytesUploaded - tracking.bytesUploaded;
+			
+			if (deltaBytes === 0 || deltaTime === 0) {
+				return tracking;
+			}
+			
+			// Update tracking object
+			tracking.lastTime = now;
+			tracking.bytesUploaded = bytesUploaded;
+			
+			// Calculate speeds
+			tracking.currentSpeed = (deltaBytes * 8 ) / (deltaTime / 1000);
+			tracking.averageSpeed = (tracking.bytesUploaded * 8) / ((now - tracking.startTime) / 1000);
+
+			// Calculate moving average
+			tracking.movingAverageHistory.push(tracking.currentSpeed);
+			if (tracking.movingAverageHistory.length > this.settings.moving_average_history_size) {
+				tracking.movingAverageHistory.shift();
+			}
+			
+			tracking.movingAverageSpeed = SWFUpload.speed.calculateMovingAverage(tracking.movingAverageHistory);
+			
+			// Update times
+			tracking.timeRemaining = (file.size - tracking.bytesUploaded) * 8 / tracking.movingAverageSpeed;
+			tracking.timeElapsed = (now - tracking.startTime) / 1000;
+			
+			// Update percent
+			tracking.percentUploaded = (tracking.bytesUploaded / file.size * 100);
+		}
+		
+		return tracking;
+	};
+	SWFUpload.speed.removeTracking = function (file, trackingList) {
+		try {
+			trackingList[file.id] = null;
+			delete trackingList[file.id];
+		} catch (ex) {
+		}
+	};
+	
+	SWFUpload.speed.formatUnits = function (baseNumber, unitDivisors, unitLabels, singleFractional) {
+		var i, unit, unitDivisor, unitLabel;
+
+		if (baseNumber === 0) {
+			return "0 " + unitLabels[unitLabels.length - 1];
+		}
+		
+		if (singleFractional) {
+			unit = baseNumber;
+			unitLabel = unitLabels.length >= unitDivisors.length ? unitLabels[unitDivisors.length - 1] : "";
+			for (i = 0; i < unitDivisors.length; i++) {
+				if (baseNumber >= unitDivisors[i]) {
+					unit = (baseNumber / unitDivisors[i]).toFixed(2);
+					unitLabel = unitLabels.length >= i ? " " + unitLabels[i] : "";
+					break;
+				}
+			}
+			
+			return unit + unitLabel;
+		} else {
+			var formattedStrings = [];
+			var remainder = baseNumber;
+			
+			for (i = 0; i < unitDivisors.length; i++) {
+				unitDivisor = unitDivisors[i];
+				unitLabel = unitLabels.length > i ? " " + unitLabels[i] : "";
+				
+				unit = remainder / unitDivisor;
+				if (i < unitDivisors.length -1) {
+					unit = Math.floor(unit);
+				} else {
+					unit = unit.toFixed(2);
+				}
+				if (unit > 0) {
+					remainder = remainder % unitDivisor;
+					
+					formattedStrings.push(unit + unitLabel);
+				}
+			}
+			
+			return formattedStrings.join(" ");
+		}
+	};
+	
+	SWFUpload.speed.formatBPS = function (baseNumber) {
+		var bpsUnits = [1073741824, 1048576, 1024, 1], bpsUnitLabels = ["Gbps", "Mbps", "Kbps", "bps"];
+		return SWFUpload.speed.formatUnits(baseNumber, bpsUnits, bpsUnitLabels, true);
+	
+	};
+	SWFUpload.speed.formatTime = function (baseNumber) {
+		var timeUnits = [86400, 3600, 60, 1], timeUnitLabels = ["d", "h", "m", "s"];
+		return SWFUpload.speed.formatUnits(baseNumber, timeUnits, timeUnitLabels, false);
+	
+	};
+	SWFUpload.speed.formatBytes = function (baseNumber) {
+		var sizeUnits = [1073741824, 1048576, 1024, 1], sizeUnitLabels = ["GB", "MB", "KB", "bytes"];
+		return SWFUpload.speed.formatUnits(baseNumber, sizeUnits, sizeUnitLabels, true);
+	
+	};
+	SWFUpload.speed.formatPercent = function (baseNumber) {
+		return baseNumber.toFixed(2) + " %";
+	};
+	
+	SWFUpload.speed.calculateMovingAverage = function (history) {
+		var vals = [], size, sum = 0.0, mean = 0.0, varianceTemp = 0.0, variance = 0.0, standardDev = 0.0;
+		var i;
+		var mSum = 0, mCount = 0;
+		
+		size = history.length;
+		
+		// Check for sufficient data
+		if (size >= 8) {
+			// Clone the array and Calculate sum of the values 
+			for (i = 0; i < size; i++) {
+				vals[i] = history[i];
+				sum += vals[i];
+			}
+
+			mean = sum / size;
+
+			// Calculate variance for the set
+			for (i = 0; i < size; i++) {
+				varianceTemp += Math.pow((vals[i] - mean), 2);
+			}
+
+			variance = varianceTemp / size;
+			standardDev = Math.sqrt(variance);
+			
+			//Standardize the Data
+			for (i = 0; i < size; i++) {
+				vals[i] = (vals[i] - mean) / standardDev;
+			}
+
+			// Calculate the average excluding outliers
+			var deviationRange = 2.0;
+			for (i = 0; i < size; i++) {
+				
+				if (vals[i] <= deviationRange && vals[i] >= -deviationRange) {
+					mCount++;
+					mSum += history[i];
+				}
+			}
+			
+		} else {
+			// Calculate the average (not enough data points to remove outliers)
+			mCount = size;
+			for (i = 0; i < size; i++) {
+				mSum += history[i];
+			}
+		}
+
+		return mSum / mCount;
+	};
+	
 }
\ No newline at end of file
diff -x .svn -aruN 2.8.5.src/wp-includes/version.php 2.8.6.src/wp-includes/version.php
--- 2.8.5.src/wp-includes/version.php	2009-10-20 17:11:32.000000000 -0500
+++ 2.8.6.src/wp-includes/version.php	2009-11-12 11:45:53.000000000 -0600
@@ -8,7 +8,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '2.8.5';
+$wp_version = '2.8.6';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
