Merge branch 'Release_2_7_Branch_hotfix_JAL-962' into Release_2_7_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Oct 2011 12:09:37 +0000 (13:09 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 21 Oct 2011 12:09:37 +0000 (13:09 +0100)

Trivial merge