Merge branch 'JWS-27-jronn' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 4 Jun 2012 16:09:07 +0000 (17:09 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Mon, 4 Jun 2012 16:09:07 +0000 (17:09 +0100)

Trivial merge