Merge branch 'test_paolo_JAL-1065' into Release_2_7_Branch
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 10 Apr 2012 07:51:50 +0000 (08:51 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 10 Apr 2012 07:51:50 +0000 (08:51 +0100)

Trivial merge