Index: /FCKpackager/trunk/fckpackager.php
===================================================================
--- /FCKpackager/trunk/fckpackager.php	(revision 2237)
+++ /FCKpackager/trunk/fckpackager.php	(revision 2238)
@@ -309,5 +309,5 @@
 		// Remove "/* */" comments
 		$script = preg_replace(
-			'/(?m-s:^\s*\/\*).*?\*\//s',
+			'/\/\*.*?\*\//s',
 			'', $script ) ;
 
@@ -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 ) ;
 	}