Index: /CKEditor/branches/prototype/_dev/packager/fckpackager.php
===================================================================
--- /CKEditor/branches/prototype/_dev/packager/fckpackager.php	(revision 2238)
+++ /CKEditor/branches/prototype/_dev/packager/fckpackager.php	(revision 2239)
@@ -1,3 +1,3 @@
-#!/usr/bin/php -q
+#!/usr/bin/php -q
 <?php
 /*
@@ -307,14 +307,14 @@
 		$script = $stringsProc->ProtectStrings( $script ) ;
 
+		// Remove "/* */" comments
+		$script = preg_replace(
+			'/\/\*.*?\*\//s',
+			'', $script ) ;
+
 		// Remove "//" comments
 		$script = preg_replace(
-			'/\/\/.*$/m',
-			'', $script ) ;
-
-		// Remove "/* */" comments
-		$script = preg_replace(
-			'/(?m-s:^\s*\/\*).*?\*\//s',
-			'', $script ) ;
-
+				'/\/\/.*$/m',
+				'', $script ) ;
+		
 		// Remove spaces before the ";" at the end of the lines
 		$script = preg_replace(
@@ -700,6 +700,7 @@
 	function ProtectStrings( $source )
 	{
+		// Catches string literals, regular expressions and conditional comments.
 		return preg_replace_callback(
-			'/(?:("|\').*?(?<!\\\\)\1|(?<![\/\\\\])\/[^\/\*].*?(?<!\\\\)\/)/',
+			'/(?:("|\').*?(?<!\\\\)\1)|(?:(?<![\*\/\\\\])\/[^\/\*].*?(?<!\\\\)\/(?!\s+[\w\d])(?=.*;))|(?s:\/\*@(?:cc_on|if|elif|else|end).*?@\*\/)/',
 			array( &$this, '_ProtectStringsMatch' ), $source ) ;
 	}
Index: /CKEditor/branches/prototype/fckpackager.xml
===================================================================
--- /CKEditor/branches/prototype/fckpackager.xml	(revision 2238)
+++ /CKEditor/branches/prototype/fckpackager.xml	(revision 2239)
@@ -59,6 +59,8 @@
 		<File path="_source/core/ckeditor_basic.js" />
 		<File path="_source/core/dom.js" />
+		<File path="_source/core/dom/event.js" />
+		<File path="_source/core/dom/domobject.js" />
+		<File path="_source/core/tools.js" />
 		<File path="_source/core/dom/node.js" />
-		<File path="_source/core/tools.js" />
 		<File path="_source/core/dom/element.js" />
 		<File path="_source/core/dom/window.js" />