Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.541
diff -u -p -r1.541 comment.module
--- modules/comment/comment.module	30 Apr 2007 17:03:24 -0000	1.541
+++ modules/comment/comment.module	10 May 2007 04:26:50 -0000
@@ -1817,6 +1817,9 @@ function comment_controls_submit($form_i
  */
 function template_preprocess_comment(&$variables) {
   $comment = $variables['comment'];
+  $node = node_load($comment->nid);
+
+  $variables['node']      = $node;
   $variables['author']    = theme('username', $comment);
   $variables['comment']   = $comment;
   $variables['content']   = $comment->comment;
@@ -1829,6 +1832,7 @@ function template_preprocess_comment(&$v
                       array('!a' => theme('username', $comment),
                             '@b' => format_date($comment->timestamp)));
   $variables['title']     = l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid"));
+  $variables['template_files'][] = 'comment-'. $node->type;
 }
 
 function theme_comment_folded($comment) {