--- /Users/brent/Sites/CVS1/blueprint/page.tpl.php
+++ page.tpl.php 
@@ -22,9 +22,16 @@
 
 <div class="container">
   <div id="header">
-    <h1 id="logo">
-      <a title="<?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?>" href="<?php print url(); ?>"><?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?></a>
-    </h1>
+    <?php if ($logo || $site_name): ?>
+      <h1 id="logo">
+        <?php if ($logo){ ?>
+          <a title="<?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?>" href="<?php print url(); ?>"><img src="<?php print($logo) ?>" alt="<?php print $site_name; ?>" border="0" /><?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?></a>
+        <?php }else{ ?>
+          <a title="<?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?>" href="<?php print url(); ?>"><?php print $site_name; ?><?php if ($site_slogan != '') print ' &ndash; '. $site_slogan; ?></a>
+        <?php } ?>
+        
+      </h1>
+    <?php endif ?>
     <?php print $header; ?>
     <?php if (isset($primary_links)) : ?>
       <?php print theme('links', $primary_links, array('id' => 'nav', 'class' => 'links')) ?>