Merge branch 'Release_2_7_Branch' Release_2_7
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 28 Sep 2011 15:10:48 +0000 (16:10 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 28 Sep 2011 15:10:48 +0000 (16:10 +0100)

Trivial merge