Merge branch 'master' into debian-master

diff --combined templates/html/show.tmpl
index c380d9f30d2e2af28fa11f5ed9885cd34fd5dddf,8fc9143544a924066c7cb38dff5d0a80287353b9..d6797de6717ec92049f14d9e66573933cf16c6e5
--- 1/templates/html/show.tmpl
--- 2/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -64,9 -64,7 +64,9 @@@
  <div id="pmoreinfo">
  <h2>[% g('Links for %s', pkg) %]</h2>
  [% IF screenshots_url && screenshots_thumb_url && !is_source %]
 +<div class="screenshot">
  <a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% "$screenshots_thumb_url/$pkg/$version" %]" alt="Screenshot" border="0"/></a>
 +</div>
  [% END %]
  <h3>[% g('%s Resources:', organisation) %]</h3>
  <ul>
@@@ -112,7 -110,7 +112,7 @@@
  </ul>
  
  [% IF src %]
 -  <p>[% g('Download Source Package <a href="%s">%s</a>:', src.url, src.pkg) %]
 +  <h3>[% g('Download Source Package <a href="%s">%s</a>:', src.url, src.pkg) %]</h3>
    [% FOREACH src.downloads %]
      [% '<ul>' IF loop.first %]
      <li><a href="[% server _ path %]">[[% name %]]</a></li>
@@@ -324,7 -322,7 +324,7 @@@
        version_class = 'vold';
     END %]
  [% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]
- <td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', d.instsize) %]</td>
+ <td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', num.format_number(d.instsize,1)) %]</td>
  <td>
  [% IF d.contents_avail %]
    [<a href="[% make_url(filelist_url,'','arch',d.arch) %]">[% g('list of files') %]</a>]