Merge branch 'Release_2_7_branch'
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 Nov 2011 16:16:21 +0000 (16:16 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 4 Nov 2011 16:16:21 +0000 (16:16 +0000)

Trivial merge