User: jwolf Branch: HEAD Date: Mon, 05 Jan 2009 09:17:15 +0000 Modified files: /themes/acquia_marina acquia_marina.info icons.css ie6-fixes.css ie7-fixes.css local_sample.css page.tpl.php search-result.tpl.php style.css template.php theme-settings.php Log message: merging to HEAD Links: http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/acqui... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/icons... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/ie6-f... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/ie7-f... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/local... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/page.... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/searc... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/style... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/templ... http://cvs.drupal.org/diff.php?path=contributions/themes/acquia_marina/theme...