Merge branch 'master' into Aristo2

AppKit/CPCookie.j

@@ -94,7 +94,7 @@
         domain = "";
 
 #if PLATFORM(DOM)
-    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
+    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
 #else
     _cookieValue = value;
     _expires = expires;

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -3,7 +3,7 @@
  *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import @"CPPopUpButton.j"
+@import "CPPopUpButton.j"
 
 var GRADIENT_START_COLOR = "#fcfcfc",
     GRADIENT_END_COLOR = "#dfdfdf",