Merge branch 'JWS-29' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 1 Jun 2012 11:56:37 +0000 (12:56 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 1 Jun 2012 11:56:37 +0000 (12:56 +0100)

Trivial merge