Merge branch 'patch_JAL-1004' into Release_2_7_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Sun, 20 Nov 2011 18:46:14 +0000 (18:46 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Sun, 20 Nov 2011 18:46:14 +0000 (18:46 +0000)

Trivial merge