Merge branch 'master' into mead

www/kojiweb/rpmlist.chtml

@@ -44,11 +44,13 @@
     <tr class="$util.rowToggle($self)">
       #set $epoch = ($rpm.epoch != None and $str($rpm.epoch) + ':' or '')
       <td><a href="rpminfo?rpmID=$rpm.id">$rpm.name-$epoch$rpm.version-$rpm.release.${rpm.arch}.rpm</a></td>
+      #if $type == 'component'
       #if $rpm.external_repo_id == 0
       <td>internal</td>
       #else
       <td><a href="externalrepoinfo?extrepoID=$rpm.external_repo_id">$rpm.external_repo_name</a></td>
       #end if
+      #end if
       #if $type == 'component'
       #set $update = $rpm.is_update and 'yes' or 'no'
       <td class="$update">$util.imageTag($update)</td>