Merge branch 'rel_2_7' of git.evergreen-ils.org:Evergreen into rel_2_7_mergery

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Conflicts:
	Open-ILS/src/templates/opac/parts/record/summary.tt2

diff --cc Open-ILS/src/extras/install/Makefile.ubuntu-precise
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/record/summary.tt2
index afa542a,79ab4ff..fe09c7e
--- 1/Open-ILS/src/templates/opac/parts/record/summary.tt2
--- 2/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@@ -106,14 -106,12 +106,13 @@@
          </tr>
      [%- END %]
      </tbody></table>
- [%- END %]
      </div>    
  [%- END %]
 -[%- END %]
 -[%- merged_uris = args.uris.merge(args.online_res);
 -num_uris = merged_uris.size;
 -IF num_uris > 0;
 +[%- # Avoid showing URLs from 856 fields if we have OpenURL results
 +    IF openurls.size == 0;
 +        merged_uris = args.uris.merge(args.online_res);
 +        num_uris = merged_uris.size;
 +        IF num_uris > 0;
  -%]
  <h2 class="rdetail_uris">[% l("Electronic resources") %]</h2>
  <div class="rdetail_uris">
@@@ -131,8 -129,7 +130,9 @@@
      [%- END %]
      [%- IF num_uris > 1 %]</ul>[% END %]
  </div>
 -[%- END %]
 +[%- END;
++      END;
 +        END; %]
  [%- # Hold/copy summary
      IF ctx.copy_summary.0.count
  %]