Index: editors/markitup.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/editors/markitup.inc,v
retrieving revision 1.11
diff -u -p -r1.11 markitup.inc
--- editors/markitup.inc	13 Nov 2010 18:31:19 -0000	1.11
+++ editors/markitup.inc	19 Dec 2010 19:18:22 -0000
@@ -97,9 +97,12 @@ function wysiwyg_markitup_themes($editor
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_markitup_settings($editor, $config, $theme) {
-  // Whoever is guilty for adding this horrible CSS-file-without-filepath
-  // override "feature" to Drupal core... stand in the corner!
-  drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', 'theme');
+  drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', array(
+    // Specify an alternate basename; otherwise, style.css would override a
+    // commonly used style.css file of the theme.
+    'basename' => 'markitup.' . $theme . '.style.css',
+    'group' => CSS_THEME,
+  ));
 
   $settings = array(
     'root' => base_path() . $editor['library path'] . '/markitup/',