Merge remote branch 'upstream/master'

mfb · mfb · commit 67d94a08299c · 2010-05-14T13:13:56.000-07:00
Conflicts:
	src/toolbox/toolbox.flashembed.js
diff --git a/src/toolbox/toolbox.flashembed.js b/src/toolbox/toolbox.flashembed.js
@@ -150,7 +150,7 @@
 			/******* OBJECT tag and it's attributes *******/
 			var html = '<object width="' + opts.width + 
 				'" height="' + opts.height + 
-				'" id="' + opts.id +
+				'" id="' + opts.id + 
 				'" name="' + opts.id + '"';
 			
 			if (opts.cachebusting) {
