--- trunk/lib/Frey/Introspect.pm	2008/07/15 23:35:27	139
+++ trunk/lib/Frey/Introspect.pm	2008/07/16 00:06:19	140
@@ -174,7 +174,7 @@
 			Frey::ClassBrowser->new->markup .
 			qq|</div>|;
 
-		my ( $superclasses, $roles ) = ( '', 'Role' );
+		my ( $superclasses, $roles ) = ( '<b>Role</b>', '' );
 		if ( ! $is_role ) {
 			if ( $meta->superclasses ) {
 				$superclasses = 'Superclasses: ' .
@@ -184,11 +184,15 @@
 						$meta->superclasses
 					);
 			}
+		}
 
-			if ( $meta->can('roles') ) {
-				$roles = join(', ', map { my $r = $_->name; qq|<a href="/~/$r">$r</a>| } @{ $meta->roles } );
-				$roles = " with roles: $roles" if $roles;
-			}
+		if ( $meta->can('roles') ) {
+			$roles = join(', ',
+				grep { ! m/\Q$package\E/ }	# skip me
+				map { my $r = $_->name; qq|<a href="/~/$r">$r</a>| }
+				$meta->calculate_all_roles
+			);
+			$roles = " with roles: $roles" if $roles;
 		}
 
 		my $pod = Frey::Pod->new( class => $package )->markup;