Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.56
diff -u -r1.56 style.css
--- themes/garland/style.css	28 May 2009 16:44:07 -0000	1.56
+++ themes/garland/style.css	30 May 2009 21:41:54 -0000
@@ -673,7 +673,7 @@
   padding-left: 1em;
 }
 
-.picture, .comment .submitted {
+.user-picture, .comment .submitted {
   float: right; /* LTR */
   clear: right; /* LTR */
   padding-left: 1em; /* LTR */
Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.12
diff -u -r1.12 style-rtl.css
--- themes/garland/style-rtl.css	11 Apr 2009 22:19:46 -0000	1.12
+++ themes/garland/style-rtl.css	30 May 2009 21:41:54 -0000
@@ -168,7 +168,7 @@
   padding-left: 0;
 }
 
-.picture, .comment .submitted {
+.user-picture, .comment .submitted {
   padding-left: 0;
   float: left;
   clear: left;
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.12
diff -u -r1.12 node.tpl.php
--- modules/node/node.tpl.php	28 May 2009 16:44:06 -0000	1.12
+++ modules/node/node.tpl.php	30 May 2009 21:41:54 -0000
@@ -65,30 +65,34 @@
  * @see template_process()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?> clearfix">
+<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
 
-<?php print $picture ?>
+  <?php print $picture; ?>
 
-<?php if (!$page): ?>
-  <h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
-
-  <div class="meta">
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted ?></span>
+  <?php if (!$page): ?>
+    <h2 class="title"><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
   <?php endif; ?>
 
-  <?php if ($terms): ?>
-    <div class="terms terms-inline"><?php print $terms ?></div>
+  <?php if ($submitted || $terms): ?>
+    <div class="meta">
+      <?php if ($submitted): ?>
+        <span class="submitted"><?php print $submitted; ?></span>
+      <?php endif; ?>
+
+      <?php if ($terms): ?>
+        <div class="terms"><?php print $terms; ?></div>
+      <?php endif;?>
+    </div>
   <?php endif;?>
-  </div>
 
   <div class="content">
-    <?php print $content ?>
+    <?php print $content; ?>
   </div>
 
-  <?php print $links; ?>
+  <?php if ($links): ?>
+    <div class="links"><?php print $links; ?></div>
+  <?php endif;?>
 
   <?php print $comments; ?>
 
-</div>
\ No newline at end of file
+</div>
Index: modules/user/user-picture.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-picture.tpl.php,v
retrieving revision 1.4
diff -u -r1.4 user-picture.tpl.php
--- modules/user/user-picture.tpl.php	24 Apr 2009 09:03:21 -0000	1.4
+++ modules/user/user-picture.tpl.php	30 May 2009 21:41:54 -0000
@@ -16,7 +16,7 @@
  */
 ?>
 <?php if ($picture): ?>
-  <div class="picture">
+  <div class="user-picture">
     <?php print $picture; ?>
   </div>
 <?php endif; ?>
Index: modules/user/user.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.css,v
retrieving revision 1.10
diff -u -r1.10 user.css
--- modules/user/user.css	9 Oct 2008 04:19:44 -0000	1.10
+++ modules/user/user.css	30 May 2009 21:41:54 -0000
@@ -33,7 +33,7 @@
   clear: both;
   margin: 1em 0;
 }
-.profile .picture {
+.profile .user-picture {
   float: right; /* LTR */
   margin: 0 1em 1em 0; /* LTR */
 }
Index: modules/user/user-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-rtl.css,v
retrieving revision 1.4
diff -u -r1.4 user-rtl.css
--- modules/user/user-rtl.css	8 Apr 2008 22:50:55 -0000	1.4
+++ modules/user/user-rtl.css	30 May 2009 21:41:54 -0000
@@ -11,7 +11,7 @@
   clear: left;
 }
 
-.profile .picture {
+.profile .user-picture {
   float: left;
   margin: 0 0 1em 1em;
 }