Merge branch 'JAL-980_jmol_patch' into Release_2_7_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 Nov 2011 15:41:55 +0000 (15:41 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 Nov 2011 15:41:55 +0000 (15:41 +0000)

Trivial merge