Merge branch 'Release_2_7_Branch'
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 3 Oct 2011 14:23:19 +0000 (15:23 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 3 Oct 2011 14:23:19 +0000 (15:23 +0100)

Trivial merge