Merge branch 'JWS-36' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 1 Jun 2012 10:08:04 +0000 (11:08 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 1 Jun 2012 10:08:04 +0000 (11:08 +0100)

Trivial merge