diff -r 488665d49417 -r 57ce13805b6f includes/clientside/tinymce/plugins/table/js/merge_cells.js
--- a/includes/clientside/tinymce/plugins/table/js/merge_cells.js	Sun Dec 21 15:35:46 2008 -0500
+++ b/includes/clientside/tinymce/plugins/table/js/merge_cells.js	Sun Dec 21 16:28:00 2008 -0500
@@ -15,7 +15,7 @@
 	tinyMCEPopup.restoreSelection();
 
 	if (!AutoValidator.validate(f)) {
-		alert(tinyMCEPopup.getLang('invalid_data'));
+		tinyMCEPopup.alert(tinyMCEPopup.getLang('invalid_data'));
 		return false;
 	}